diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-01 21:42:45 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-01 21:42:45 +0000 |
| commit | e0fec86fae2e25e3dae3ae94de07155ab581d4b8 (patch) | |
| tree | 02e02ad4f75b6f2a7665a956f614524932380f81 /libs/ardour/session_process.cc | |
| parent | b6d418f3c292a3e8720f940afb5085ca5ea84d48 (diff) | |
continue with MTC debugging
git-svn-id: svn://localhost/ardour2/branches/3.0@6259 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_process.cc')
| -rw-r--r-- | libs/ardour/session_process.cc | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 0af2e37b57..e270a7c3ec 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -645,11 +645,7 @@ Session::calculate_moving_average_of_slave_delta(int dir, nframes_t this_delta) } void -Session::track_slave_state( - float slave_speed, - nframes_t slave_transport_frame, - nframes_t this_delta, - bool starting) +Session::track_slave_state (float slave_speed, nframes_t slave_transport_frame, nframes_t this_delta, bool starting) { if (slave_speed != 0.0f) { @@ -659,6 +655,7 @@ Session::track_slave_state( case Stopped: if (_slave->requires_seekahead()) { slave_wait_end = slave_transport_frame + _current_frame_rate; + DEBUG_TRACE (DEBUG::Slave, string_compose ("slave stopped, but running, requires seekahead to %1\n", slave_wait_end)); locate (slave_wait_end, false, false); slave_state = Waiting; starting = true; @@ -681,22 +678,12 @@ Session::track_slave_state( break; case Waiting: - break; - - default: - break; + DEBUG_TRACE (DEBUG::Slave, string_compose ("slave waiting at %1\n", slave_transport_frame)); - } + if (slave_transport_frame >= slave_wait_end) { - if (slave_state == Waiting) { + DEBUG_TRACE (DEBUG::Slave, string_compose ("slave start at %1 vs %2\n", slave_transport_frame, _transport_frame)); - #ifdef DEBUG_SLAVES - cerr << "waiting at " << slave_transport_frame << endl; - #endif - if (slave_transport_frame >= slave_wait_end) { -#ifdef DEBUG_SLAVES - cerr << "\tstart at " << _transport_frame << endl; -#endif slave_state = Running; bool ok = true; @@ -726,6 +713,10 @@ Session::track_slave_state( average_slave_delta = 0L; this_delta = 0; } + break; + + default: + break; } if (slave_state == Running && _transport_speed == 0.0f) { |