ignore "external timecode is sync locked" for non timecode slaves.

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

diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc
index 4a40bb40a2acd4d7e29906b1fc82e2b3e26a5966..8d08fd6bb5ab9184e77ba559d65ed6843af0bf7a 100644 (file)
--- a/libs/ardour/ltc_slave.cc
+++ b/libs/ardour/ltc_slave.cc
@@ -95,7 +95,6 @@ void
 LTC_Slave::parameter_changed (std::string const & p)
 {
        if (p == "slave-timecode-offset"
-                       || p == "subframes-per-frame"
                        || p == "timecode-format"
                        ) {
                parse_timecode_offset();
@@ -295,7 +294,7 @@ LTC_Slave::detect_ltc_fps(int frameno, bool df)
 }
 
 void
-LTC_Slave::process_ltc(framepos_t const now)
+LTC_Slave::process_ltc(framepos_t const /*now*/)
 {
        LTCFrameExt frame;
        enum LTC_TV_STANDARD tv_standard = LTC_TV_625_50;
@@ -359,13 +358,13 @@ LTC_Slave::process_ltc(framepos_t const now)
                        ltc_frame_increment(&frame.ltc, fps_i, tv_standard, 0);
                        ltc_frame_to_time(&stime, &frame.ltc, 0);
                        transport_direction = 1;
-                       frame.off_start -= ltc_frame_alignment(session.frame_rate(), tv_standard);
-                       frame.off_end -= ltc_frame_alignment(session.frame_rate(), tv_standard);
+                       frame.off_start -= ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard);
+                       frame.off_end -= ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard);
                } else {
                        ltc_frame_decrement(&frame.ltc, fps_i, tv_standard, 0);
                        int off = frame.off_end - frame.off_start;
-                       frame.off_start += off - ltc_frame_alignment(session.frame_rate(), tv_standard);
-                       frame.off_end += off - ltc_frame_alignment(session.frame_rate(), tv_standard);
+                       frame.off_start += off - ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard);
+                       frame.off_end += off - ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard);
                        transport_direction = -1;
                }
 
@@ -577,7 +576,7 @@ std::string
 LTC_Slave::approximate_current_position() const
 {
        if (last_timestamp == 0) {
-               return " \u2012\u2012:\u2012\u2012:\u2012\u2012:\u2012\u2012";
+               return " --:--:--:--";
        }
        return Timecode::timecode_format_time(timecode);
 }
@@ -591,7 +590,7 @@ LTC_Slave::approximate_current_delta() const
        } else if ((monotonic_cnt - last_timestamp) > 2 * frames_per_ltc_frame) {
                snprintf(delta, sizeof(delta), _("flywheel"));
        } else {
-               snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%s%" PRIi64 "</span> sm",
+               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);