ardour/livetrax
13
0
Fork 0
Code

MTC Slave: allow >2 sec for re-sync, format delta

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13289 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Robin Gareus 2012-10-16 20:53:10 +00:00
parent 625ee55df0
commit 64b0efdf9f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/mtc_slave.cc
View File

@ -621,7 +621,8 @@ MTC_Slave::speed_and_position (double& speed, framepos_t& pos)
* also see note in MTC_Slave::init_engine_dll
*/
if (!session.actively_recording()
&& ( (pos < 0) || (labs(pos - sess_pos) > 4 * resolution()) )
&& speed != 0
&& ( (pos < 0) || (labs(pos - sess_pos) > 3 * session.frame_rate()) )
) {
engine_dll_initstate = 0;
queue_reset (false);
@ -666,7 +667,7 @@ MTC_Slave::approximate_current_delta() const
snprintf(delta, sizeof(delta), "---");
} else {
// TODO if current_delta > 1 frame -> display timecode.
snprintf(delta, sizeof(delta), "%+" PRIi64 " sm", current_delta);
snprintf(delta, sizeof(delta), "%+4" PRIi64 " sm", current_delta);
}
return std::string(delta);
}