X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fjack_slave.cc;h=4c2da4c6c45287a7a57aea78dde464ed28ab641d;hb=3eef81daa23ebf8dffe65f02799c8383385e1128;hp=9f92f1b21f8ff0100ad0761d5b15556f74905917;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/jack_slave.cc b/libs/ardour/jack_slave.cc
index 9f92f1b21f..4c2da4c6c4 100644
--- a/libs/ardour/jack_slave.cc
+++ b/libs/ardour/jack_slave.cc
@@ -18,25 +18,21 @@
 */
 
 #include <iostream>
+#include <cerrno>
 
-#include <errno.h>
 #include <jack/jack.h>
 #include <jack/transport.h>
 
 #include "ardour/slave.h"
-#include "ardour/session.h"
-
-#include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
-using namespace sigc;
 
 JACK_Slave::JACK_Slave (jack_client_t* j)
 	: jack (j)
 {
 	double x;
-	nframes_t p;
+	framepos_t p;
 	/* call this to initialize things */
 	speed_and_position (x, p);
 }
@@ -64,10 +60,11 @@ JACK_Slave::ok() const
 }
 
 bool
-JACK_Slave::speed_and_position (double& sp, nframes_t& position)
+JACK_Slave::speed_and_position (double& sp, framepos_t& position)
 {
 	jack_position_t pos;
 	jack_transport_state_t state;
+
 	state = jack_transport_query (jack, &pos);
 
 	switch (state) {