ardour/livetrax
13
0
Fork 0
Code

Merge branch 'ardour'

Browse Source
This commit is contained in:
Robin Gareus 2024-08-02 23:35:36 +02:00
commit 7b1fe0e8b6
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/ardour/ltc_slave.cc
View File

@ -100,6 +100,8 @@ LTC_TransportMaster::set_session (Session *s)
parse_timecode_offset(); parse_timecode_offset();
reset (true); reset (true);
fps_detected = false;
_session->config.ParameterChanged.connect_same_thread (session_connections, boost::bind (&LTC_TransportMaster::parameter_changed, this, _1)); _session->config.ParameterChanged.connect_same_thread (session_connections, boost::bind (&LTC_TransportMaster::parameter_changed, this, _1));
_session->LatencyUpdated.connect_same_thread (session_connections, boost::bind (&LTC_TransportMaster::resync_latency, this, _1)); _session->LatencyUpdated.connect_same_thread (session_connections, boost::bind (&LTC_TransportMaster::resync_latency, this, _1));
} }
@ -121,6 +123,7 @@ LTC_TransportMaster::connection_handler (std::weak_ptr<ARDOUR::Port> w0, std::st
std::shared_ptr<Port> p = w1.lock (); std::shared_ptr<Port> p = w1.lock ();
if (p == _port) { if (p == _port) {
resync_latency (false); resync_latency (false);
fps_detected = false;
} }
} }
@ -354,12 +357,12 @@ LTC_TransportMaster::detect_ltc_fps(int frameno, bool df)
} }
} }
timecode_format_valid = true; /* SET FLAG */ if (!timecode_format_valid) {
fps_changed = true;
}
if (timecode.rate != detected_fps || timecode.drop != df) { if (timecode.rate != detected_fps || timecode.drop != df) {
DEBUG_TRACE (DEBUG::LTC, string_compose ("detected FPS: %1%2\n", detected_fps, df?"df":"ndf")); DEBUG_TRACE (DEBUG::LTC, string_compose ("detected FPS: %1%2\n", detected_fps, df?"df":"ndf"));
} else {
detected_fps = 0; /* no change */
} }
} }
ltc_detect_fps_cnt = ltc_detect_fps_max = 0; ltc_detect_fps_cnt = ltc_detect_fps_max = 0;
@ -413,6 +416,7 @@ LTC_TransportMaster::process_ltc(samplepos_t const now)
if (!ltc_is_stationary && detect_ltc_fps (stime.frame, (ltc_frame.ltc.dfbit) ? true : false)) { if (!ltc_is_stationary && detect_ltc_fps (stime.frame, (ltc_frame.ltc.dfbit) ? true : false)) {
reset (true); reset (true);
fps_detected = true; fps_detected = true;
timecode_format_valid = true; /* SET FLAG */
} }
#ifndef NDEBUG #ifndef NDEBUG