ardour/livetrax
13
0
Fork 0
Code

MTC Slave: handle locates (quick re-sync)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13259 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Robin Gareus 2012-10-12 17:04:20 +00:00
parent 76eb2f23d6
commit fd1ab7ad40
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/ardour/mtc_slave.cc
View File

@ -30,7 +30,6 @@
#include "ardour/slave.h" #include "ardour/slave.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
#include "ardour/pi_controller.h"
#include "i18n.h" #include "i18n.h"
@ -561,6 +560,7 @@ MTC_Slave::speed_and_position (double& speed, framepos_t& pos)
pos = last.position; pos = last.position;
session.request_locate (pos, false); session.request_locate (pos, false);
session.request_transport_speed (0); session.request_transport_speed (0);
engine_dll_initstate = 0;
queue_reset (false); queue_reset (false);
DEBUG_TRACE (DEBUG::MTC, "MTC not seen for 2 frames - reset pending\n"); DEBUG_TRACE (DEBUG::MTC, "MTC not seen for 2 frames - reset pending\n");
return false; return false;
@ -608,7 +608,12 @@ MTC_Slave::speed_and_position (double& speed, framepos_t& pos)
* engine-DLL can oscillate back before 0. * engine-DLL can oscillate back before 0.
* also see note in MTC_Slave::init_engine_dll * also see note in MTC_Slave::init_engine_dll
*/ */
if (pos <0) queue_reset(true); if (!session.actively_recording()
&& ( (pos < 0) || (labs(pos - sess_pos) > 4 * resolution()) )
) {
engine_dll_initstate = 0;
queue_reset (false);
}
DEBUG_TRACE (DEBUG::MTC, string_compose ("MTCsync spd: %1 pos: %2 | last-pos: %3 elapsed: %4 delta: %5\n", DEBUG_TRACE (DEBUG::MTC, string_compose ("MTCsync spd: %1 pos: %2 | last-pos: %3 elapsed: %4 delta: %5\n",
speed, pos, last.position, elapsed, pos - sess_pos)); speed, pos, last.position, elapsed, pos - sess_pos));