Merge branch 'master' into cairocanvas

[ardour.git] / libs / backends / jack / jack_audiobackend.cc

diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc
index 8df97a1e303e41589df44829cfbb5d397e8e50ad..1ceb794dc569558bf41224b9f9f33fc26dc21321 100644 (file)
--- a/libs/backends/jack/jack_audiobackend.cc
+++ b/libs/backends/jack/jack_audiobackend.cc
@@ -767,9 +767,6 @@ JACKAudioBackend::jack_sync_callback (jack_transport_state_t state, jack_positio
        TransportState tstate;
 
        switch (state) {
-       case JackTransportStopped:
-               tstate = TransportStopped;
-               break;
        case JackTransportRolling:
                tstate = TransportRolling;
                break;
@@ -779,6 +776,10 @@ JACKAudioBackend::jack_sync_callback (jack_transport_state_t state, jack_positio
        case JackTransportStarting:
                tstate = TransportStarting;
                break;
+       case JackTransportStopped:
+       default:
+               tstate = TransportStopped;
+               break;
        }
 
        return engine.sync_callback (tstate, pos->frame);
@@ -1015,7 +1016,7 @@ JACKAudioBackend::disconnected (const char* why)
 }
 
 float 
-JACKAudioBackend::cpu_load() const 
+JACKAudioBackend::dsp_load() const 
 {
        GET_PRIVATE_JACK_POINTER_RET(_priv_jack,0);
        return jack_cpu_load (_priv_jack);