Apply MIDI looping patch from torbenh, with minor changes.

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

diff --git a/libs/ardour/jack_slave.cc b/libs/ardour/jack_slave.cc
index 352bcaeee54e1603b466f59883edf40e0e721358..7865f5253ba02d4f94278e5737c523360d5cb628 100644 (file)
--- a/libs/ardour/jack_slave.cc
+++ b/libs/ardour/jack_slave.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <iostream>
@@ -36,7 +35,7 @@ JACK_Slave::JACK_Slave (jack_client_t* j)
        : jack (j)
 {
        float x;
-       jack_nframes_t p;
+       nframes_t p;
        /* call this to initialize things */
        speed_and_position (x, p);
 }
@@ -45,6 +44,12 @@ JACK_Slave::~JACK_Slave ()
 {
 }
 
+void
+JACK_Slave::reset_client (jack_client_t* j)
+{
+       jack = j;
+}
+
 bool
 JACK_Slave::locked() const
 {
@@ -58,7 +63,7 @@ JACK_Slave::ok() const
 }
 
 bool 
-JACK_Slave::speed_and_position (float& sp, jack_nframes_t& position) 
+JACK_Slave::speed_and_position (float& sp, nframes_t& position) 
 {
        jack_position_t pos;
        jack_transport_state_t state;
@@ -82,6 +87,8 @@ JACK_Slave::speed_and_position (float& sp, jack_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;