diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-12 10:06:59 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-12 10:06:59 -0500 |
| commit | 1676789907b95aa8d5bf6cc2ce62aa66a80b9aae (patch) | |
| tree | 7c84f3eb9a4d400a26f29461d40bd50ba32ae8d4 /libs/backends/jack/jack_audiobackend.cc | |
| parent | 88732abd0177f9ee9f4be780e3ffe724ef798c64 (diff) | |
| parent | fd1eb73ef21e8a938e34ca49378a866c381c48e3 (diff) | |
fix merge conflicts from master
Diffstat (limited to 'libs/backends/jack/jack_audiobackend.cc')
| -rw-r--r-- | libs/backends/jack/jack_audiobackend.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc index 1ceb794dc5..f34cd746f0 100644 --- a/libs/backends/jack/jack_audiobackend.cc +++ b/libs/backends/jack/jack_audiobackend.cc @@ -765,6 +765,7 @@ int JACKAudioBackend::jack_sync_callback (jack_transport_state_t state, jack_position_t* pos) { TransportState tstate; + bool tstate_valid = true; switch (state) { case JackTransportRolling: @@ -777,12 +778,17 @@ JACKAudioBackend::jack_sync_callback (jack_transport_state_t state, jack_positio tstate = TransportStarting; break; case JackTransportStopped: - default: tstate = TransportStopped; break; + default: + // ignore "unofficial" states like JackTransportNetStarting (jackd2) + tstate_valid = false; + break; } - return engine.sync_callback (tstate, pos->frame); + if (tstate_valid) { + return engine.sync_callback (tstate, pos->frame); + } return true; } |