last_mtc_fps_byte = session.get_mtc_timecode_bits ();
quarter_frame_duration = (double(session.frames_per_timecode_frame()) / 4.0);
- mtc_timecode = timecode_60; // track changes of MTC timecode
- a3e_timecode = timecode_60; // track canges of Ardour's timecode
+ mtc_timecode = session.config.get_timecode_format();
+ a3e_timecode = session.config.get_timecode_format();
printed_timecode_warning = false;
reset (true);
bool
MTC_Slave::locked () const
{
- return port->parser()->mtc_locked();
+ return port->parser()->mtc_locked() && last_inbound_frame !=0 && engine_dll_initstate !=0;
}
bool
void
MTC_Slave::init_mtc_dll(framepos_t tme, double qtr)
{
- omega = 2.0 * M_PI * qtr / double(session.frame_rate());
+ omega = 2.0 * M_PI * qtr / 2.0 / double(session.frame_rate());
b = 1.4142135623730950488 * omega;
c = omega * omega;
double mtc_speed = 0;
if (first_mtc_timestamp != 0) {
/* update MTC DLL and calculate speed */
- const double e = double(transport_direction) * (double(now) - double(current.timestamp) - qtr_d);
+ const double e = mtc_frame - (double(transport_direction) * (double(now) - double(current.timestamp) + t0));
t0 = t1;
t1 += b * e + e2;
e2 += c * e;
mtc_speed = (t1 - t0) / qtr_d;
DEBUG_TRACE (DEBUG::MTC, string_compose ("qtr frame DLL t0:%1 t1:%2 err:%3 spd:%4 ddt:%5\n", t0, t1, e, mtc_speed, e2 - qtr_d));
- }
- current.guard1++;
- current.position = mtc_frame;
- current.timestamp = now;
- current.speed = mtc_speed;
- current.guard2++;
+ current.guard1++;
+ current.position = mtc_frame;
+ current.timestamp = now;
+ current.speed = mtc_speed;
+ current.guard2++;
+
+ last_inbound_frame = now;
+ }
maybe_reset ();
- last_inbound_frame = now;
busy_guard2++;
}
can_notify_on_unknown_rate = true;
break;
case MTC_30_FPS_DROP:
- timecode.rate = (30000.0/1001.0);
+ if (Config->get_timecode_source_2997()) {
+ tc_format = Timecode::timecode_2997000drop;
+ timecode.rate = (29970.0/1000.0);
+ } else {
+ tc_format = timecode_2997drop;
+ timecode.rate = (30000.0/1001.0);
+ }
timecode.drop = true;
- tc_format = timecode_2997drop;
can_notify_on_unknown_rate = true;
break;
case MTC_30_FPS:
* But this is only really a problem if the user performs manual
* seeks while transport is running and slaved to MTC.
*/
- oe = 2.0 * M_PI * double(inc/6.0) / double(session.frame_rate());
+ oe = 2.0 * M_PI * double(inc) / 2.0 / double(session.frame_rate());
be = 1.4142135623730950488 * oe;
ce = oe * oe;
//sess_pos -= session.engine().frames_since_cycle_start();
SafeTime last;
- framecnt_t elapsed;
+ frameoffset_t elapsed;
+ bool engine_dll_reinitialized = false;
read_current (&last);
/* re-init engine DLL here when state changed (direction, first_mtc_timestamp) */
if (last.timestamp == 0) { engine_dll_initstate = 0; }
- else if (engine_dll_initstate != transport_direction) {
+ else if (engine_dll_initstate != transport_direction && last.speed != 0) {
engine_dll_initstate = transport_direction;
init_engine_dll(last.position, session.engine().frames_per_cycle());
+ engine_dll_reinitialized = true;
}
if (last.timestamp == 0) {
}
-
- DEBUG_TRACE (DEBUG::MTC, string_compose ("MTC::speed_and_position mtc-tme: %1 mtc-pos: %2\n", last.timestamp, last.position));
+ DEBUG_TRACE (DEBUG::MTC, string_compose ("MTC::speed_and_position mtc-tme: %1 mtc-pos: %2 mtc-spd: %3\n", last.timestamp, last.position, last.speed));
DEBUG_TRACE (DEBUG::MTC, string_compose ("MTC::speed_and_position eng-tme: %1 eng-pos: %2\n", now, sess_pos));
double speed_flt = last.speed; ///< MTC speed from MTC-quarter-frame DLL
else
{
/* scale elapsed time by the current MTC speed */
- if (last.timestamp && (now > last.timestamp)) {
- elapsed = (framecnt_t) rint (speed_flt * (now - last.timestamp));
- } else {
- elapsed = 0;
- }
- if (give_slave_full_control_over_transport_speed()) {
- /* there is a frame-delta engine vs MTC position
- * mostly due to quantization and rounding of (speed * nframes)
- * thus we use an other DLL..
+ elapsed = (framecnt_t) rint (speed_flt * (now - last.timestamp));
+ if (give_slave_full_control_over_transport_speed() && !engine_dll_reinitialized) {
+ /* there is an engine vs MTC position frame-delta.
+ * This mostly due to quantization and rounding of (speed * nframes)
+ * but can also due to the session-process not calling
+ * speed_and_position() every cycle under some circumstances.
+ * Thus we use an other DLL to align the engine and the MTC
*/
/* update engine DLL and calculate speed */
* 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);
}
+ /* provide a .1% deadzone to lock the speed */
+ if (fabs(speed - 1.0) <= 0.001)
+ speed = 1.0;
+
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));
return mtc_timecode;
}
-std::string
+std::string
MTC_Slave::approximate_current_position() const
{
SafeTime last;
- if (last.timestamp == 0) {
- return "--:--:--:--";
- }
read_current (&last);
+ if (last.timestamp == 0 || reset_pending) {
+ return " --:--:--:--";
+ }
return Timecode::timecode_format_sampletime(
last.position,
double(session.frame_rate()),
MTC_Slave::approximate_current_delta() const
{
char delta[24];
- snprintf(delta, sizeof(delta), "%+" PRIi64, current_delta); // XXX TODO unit, refine
+ SafeTime last;
+ read_current (&last);
+ if (last.timestamp == 0 || reset_pending) {
+ snprintf(delta, sizeof(delta), "\u2012\u2012\u2012\u2012");
+ } else {
+ // TODO if current_delta > 1 frame -> display timecode.
+ snprintf(delta, sizeof(delta), "%s%4" PRIi64 " sm",
+ PLUSMINUS(-current_delta), abs(current_delta));
+ }
return std::string(delta);
}
projects / ardour.git / blobdiff