ardour/livetrax
13
0
Fork 0
Code

debug output fixes

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6219 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-11-30 17:35:25 +00:00
parent 2c4fa9e19b
commit ce0757b604
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/session_process.cc
View File

@ -531,7 +531,7 @@ Session::follow_slave (nframes_t nframes)
calculate_moving_average_of_slave_delta(dir, this_delta);
}
track_slave_state(slave_speed, slave_transport_frame, this_delta, starting);
track_slave_state (slave_speed, slave_transport_frame, this_delta, starting);
if (slave_state == Running && !_slave->is_always_synced() && !config.get_timecode_source_is_synced()) {
@ -560,13 +560,14 @@ Session::follow_slave (nframes_t nframes)
/* too far off, so locate and keep rolling */
DEBUG_TRACE (DEBUG::Slave, string_compose ("slave delta is too big, locate to %1\n", slave_transport_frame));
request_locate (slave_transport_frame, true);
return false;
} else {
float adjusted_speed = slave_speed + (delta / float(_current_frame_rate));
if (_slave->give_slave_full_control_over_transport_speed()) {
request_transport_speed(slave_speed);
request_transport_speed (slave_speed);
} else {
request_transport_speed(adjusted_speed);
request_transport_speed (adjusted_speed);
DEBUG_TRACE (DEBUG::Slave, string_compose ("adjust using %1 towards %2 ratio %3 current %4 slave @ %5\n",
delta, adjusted_speed, adjusted_speed/slave_speed, _transport_speed,
slave_speed));
@ -586,6 +587,7 @@ Session::follow_slave (nframes_t nframes)
(int) (dir * this_delta),
slave_speed,
_transport_speed,
_transport_frame,
slave_transport_frame,
_transport_frame,
average_slave_delta));