X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fjack_slave.cc;h=116ccdd145566cdf8401c8a0df8a584e074d1692;hb=9a2164056752a958542f2d162ed3bf0f9c304121;hp=b7160489ff40d93570a8ae96c3a90483ffe9bba6;hpb=799b6ec97d2dea160ae11326fda8f50ae6c34faf;p=ardour.git

diff --git a/libs/ardour/jack_slave.cc b/libs/ardour/jack_slave.cc
index b7160489ff..116ccdd145 100644
--- a/libs/ardour/jack_slave.cc
+++ b/libs/ardour/jack_slave.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2004 Paul Davis 
+    Copyright (C) 2004 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,24 +18,24 @@
 */
 
 #include <iostream>
+#include <cerrno>
 
-#include <errno.h>
 #include <jack/jack.h>
 #include <jack/transport.h>
 
-#include <ardour/slave.h>
-#include <ardour/session.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);
 }
@@ -62,11 +62,12 @@ JACK_Slave::ok() const
 	return true;
 }
 
-bool 
-JACK_Slave::speed_and_position (double& sp, nframes_t& position) 
+bool
+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) {