allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Merge branch 'master--ignore-JackTransportNetStarting' of https://github.com/nphilipp/ardour

Browse Source
This commit is contained in:
Paul Davis
2013-12-10 11:49:18 -05:00
parent cd7072fdec a86b66181a
commit 63f8d282bd
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/backends/jack/jack_audiobackend.cc
View File

@@ -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 JackTransportStopped:
@@ -779,9 +780,15 @@ JACKAudioBackend::jack_sync_callback (jack_transport_state_t state, jack_positio
case JackTransportStarting:
tstate = TransportStarting;
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;
}