Don't raise an error when trying to auto-connect master to physical outputs if the...

[ardour.git] / libs / ardour / jack_slave.cc

diff --git a/libs/ardour/jack_slave.cc b/libs/ardour/jack_slave.cc
index f65be1deead78051fff8ee0697643a7f76058805..289b0a8fa9e35443df18bcd7fccd2ac9d6252850 100644 (file)
--- a/libs/ardour/jack_slave.cc
+++ b/libs/ardour/jack_slave.cc
@@ -23,18 +23,19 @@
 #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)
 {
-       float x;
+       double x;
        nframes_t p;
        /* call this to initialize things */
        speed_and_position (x, p);
@@ -63,11 +64,10 @@ JACK_Slave::ok() const
 }
 
 bool 
-JACK_Slave::speed_and_position (float& sp, nframes_t& position) 
+JACK_Slave::speed_and_position (double& sp, nframes_t& position) 
 {
        jack_position_t pos;
        jack_transport_state_t state;
-
        state = jack_transport_query (jack, &pos);
 
        switch (state) {
@@ -87,6 +87,8 @@ JACK_Slave::speed_and_position (float& sp, nframes_t& position)
                _starting = true;
                // don't adjust speed here, just leave it as it was
                break;
+       default:
+               cerr << "WARNING: Unknown JACK transport state: " << state << endl;
        }
 
        sp = speed;