fix typo in c212c16eb

[ardour.git] / libs / ardour / mtc_slave.cc

diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index 5a3b9b07f467159980b9364a7a5c67484c642790..8ce0722d8b790b5e1f6616050bce3803d141b55a 100644 (file)
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -56,6 +56,7 @@ MTC_Slave::MTC_Slave (Session& s, MIDI::Port& p)
        reset_pending = 0;
        reset_position = false;
        mtc_frame = 0;
+       mtc_frame_dll = 0;
        engine_dll_initstate = 0;
        busy_guard1 = busy_guard2 = 0;
 
@@ -66,6 +67,8 @@ MTC_Slave::MTC_Slave (Session& s, MIDI::Port& p)
        a3e_timecode = session.config.get_timecode_format();
        printed_timecode_warning = false;
 
+       session.config.ParameterChanged.connect_same_thread (config_connection, boost::bind (&MTC_Slave::parameter_changed, this, _1));
+       parse_timecode_offset();
        reset (true);
        rebind (p);
 }
@@ -73,6 +76,7 @@ MTC_Slave::MTC_Slave (Session& s, MIDI::Port& p)
 MTC_Slave::~MTC_Slave()
 {
        port_connections.drop_connections();
+       config_connection.disconnect();
 
        while (busy_guard1 != busy_guard2) {
                /* make sure MIDI parser is not currently calling any callbacks in here,
@@ -101,6 +105,26 @@ MTC_Slave::rebind (MIDI::Port& p)
        port->parser()->mtc_status.connect_same_thread (port_connections, boost::bind (&MTC_Slave::update_mtc_status, this, _1));
 }
 
+void
+MTC_Slave::parse_timecode_offset() {
+       Timecode::Time offset_tc;
+       Timecode::parse_timecode_format(session.config.get_slave_timecode_offset(), offset_tc);
+       offset_tc.rate = session.timecode_frames_per_second();
+       offset_tc.drop = session.timecode_drop_frames();
+       session.timecode_to_sample(offset_tc, timecode_offset, false, false);
+       timecode_negative_offset = offset_tc.negative;
+}
+
+void
+MTC_Slave::parameter_changed (std::string const & p)
+{
+       if (p == "slave-timecode-offset"
+                       || p == "timecode-format"
+                       ) {
+               parse_timecode_offset();
+       }
+}
+
 bool
 MTC_Slave::give_slave_full_control_over_transport_speed() const
 {
@@ -238,16 +262,16 @@ MTC_Slave::update_mtc_qtr (Parser& /*p*/, int which_qtr, framepos_t now)
 {
        busy_guard1++;
        const double qtr_d = quarter_frame_duration;
-       const framepos_t qtr = rint(qtr_d);
 
-       mtc_frame += qtr * transport_direction;
+       mtc_frame_dll += qtr_d * (double) transport_direction;
+       mtc_frame = rint(mtc_frame_dll);
 
        DEBUG_TRACE (DEBUG::MTC, string_compose ("qtr frame %1 at %2 -> mtc_frame: %3\n", which_qtr, now, mtc_frame));
 
        double mtc_speed = 0;
        if (first_mtc_timestamp != 0) {
                /* update MTC DLL and calculate speed */
-               const double e = mtc_frame - (double(transport_direction) * (double(now) - double(current.timestamp) + t0));
+               const double e = mtc_frame_dll - (double)transport_direction * ((double)now - (double)current.timestamp + t0);
                t0 = t1;
                t1 += b * e + e2;
                e2 += c * e;
@@ -366,9 +390,10 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, framepos_t now)
 
                        if (cur_timecode != tc_format && ! printed_timecode_warning) {
                                if (ceil(Timecode::timecode_to_frames_per_second(cur_timecode)) != ceil(Timecode::timecode_to_frames_per_second(tc_format))) {
-                                       warning << string_compose(_("Session and MTC framerate mismatch: MTC:%1 Ardour:%2."),
-                                                       Timecode::timecode_format_name(tc_format),
-                                                       Timecode::timecode_format_name(cur_timecode))
+                                       warning << string_compose(_("Session and MTC framerate mismatch: MTC:%1 %2:%3."),
+                                                                 Timecode::timecode_format_name(tc_format),
+                                                                 PROGRAM_NAME,
+                                                                 Timecode::timecode_format_name(cur_timecode))
                                                << endmsg;
                                }
                                printed_timecode_warning = true;
@@ -390,7 +415,7 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, framepos_t now)
        Timecode::timecode_to_sample (timecode, mtc_frame, true, false,
                double(session.frame_rate()),
                session.config.get_subframes_per_frame(),
-               session.config.get_slave_timecode_offset_negative(), session.config.get_slave_timecode_offset()
+               timecode_negative_offset, timecode_offset
                );
 
        DEBUG_TRACE (DEBUG::MTC, string_compose ("MTC at %1 TC %2 = mtc_frame %3 (from full message ? %4) tc-ratio %5\n",
@@ -439,6 +464,7 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, framepos_t now)
                        if (first_mtc_timestamp == 0 || current.timestamp == 0) {
                                first_mtc_timestamp = now;
                                init_mtc_dll(mtc_frame, qtr);
+                               mtc_frame_dll = mtc_frame;
                        }
                        current.guard1++;
                        current.position = mtc_frame;
@@ -661,7 +687,7 @@ MTC_Slave::approximate_current_position() const
        SafeTime last;
        read_current (&last);
        if (last.timestamp == 0 || reset_pending) {
-               return " \u2012\u2012:\u2012\u2012:\u2012\u2012:\u2012\u2012";
+               return " --:--:--:--";
        }
        return Timecode::timecode_format_sampletime(
                last.position,
@@ -679,8 +705,8 @@ MTC_Slave::approximate_current_delta() const
        if (last.timestamp == 0 || reset_pending) {
                snprintf(delta, sizeof(delta), "\u2012\u2012\u2012\u2012");
        } else {
-               snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\">%s%5" PRIi64 "</span> sm",
-                               PLUSMINUS(-current_delta), abs(current_delta));
+               snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%s%" PRIi64 "</span>sm",
+                               LEADINGZERO(abs(current_delta)), PLUSMINUS(-current_delta), abs(current_delta));
        }
        return std::string(delta);
 }