ardour/livetrax
13
0
Fork 0
Code

ignore "external timecode is sync locked" for non timecode slaves.

Browse Source
This commit is contained in:
Robin Gareus 2013-04-05 06:50:54 +02:00
parent 3f97d8c6d5
commit 985e3dcc50
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/session_process.cc
View File

@ -515,7 +515,9 @@ Session::follow_slave (pframes_t nframes)
slave_speed = 0.0f;
}
if (_slave->is_always_synced() || Config->get_timecode_source_is_synced()) {
if (_slave->is_always_synced() ||
(Config->get_timecode_source_is_synced() && (dynamic_cast<TimecodeSlave*>(_slave)) != 0)
) {
/* if the TC source is synced, then we assume that its
speed is binary: 0.0 or 1.0
@ -543,7 +545,9 @@ Session::follow_slave (pframes_t nframes)
_slave_state, slave_transport_frame, slave_speed, this_delta, average_slave_delta));
if (_slave_state == Running && !_slave->is_always_synced() && !Config->get_timecode_source_is_synced()) {
if (_slave_state == Running && !_slave->is_always_synced() &&
!(Config->get_timecode_source_is_synced() && (dynamic_cast<TimecodeSlave*>(_slave)) != 0)
) {
if (_transport_speed != 0.0f) {