diff options
| author | Robin Gareus <robin@gareus.org> | 2016-11-02 19:24:46 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-11-02 19:24:46 +0100 |
| commit | 3abdef263741db533f9c0e37251ea4905bbf486b (patch) | |
| tree | c25a1ed141d0baca87460f890abc0acc7503aefb /libs/ardour/session_ltc.cc | |
| parent | da32ae4e1f25780d4513bf25b9be35ae2b84ac6b (diff) | |
fix LTC-generator 24h wraparound
Diffstat (limited to 'libs/ardour/session_ltc.cc')
| -rw-r--r-- | libs/ardour/session_ltc.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/ardour/session_ltc.cc b/libs/ardour/session_ltc.cc index 945f96519e..0ce7d766fc 100644 --- a/libs/ardour/session_ltc.cc +++ b/libs/ardour/session_ltc.cc @@ -482,8 +482,9 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end rint(ltc_enc_pos + ltc_enc_cnt - poff) - cycle_start_frame )); + const framecnt_t wrap24h = 86400. * frame_rate(); if (ltc_enc_pos < 0 - || (ltc_speed != 0 && fabs(ceil(ltc_enc_pos + ltc_enc_cnt - poff) - cycle_start_frame) > maxdiff) + || (ltc_speed != 0 && fabs(fmod(ceil(ltc_enc_pos + ltc_enc_cnt - poff), wrap24h) - (cycle_start_frame % wrap24h)) > maxdiff) ) { // (5) re-align @@ -491,7 +492,7 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end /* set frame to encode */ SMPTETimecode tc; - tc.hours = tc_start.hours; + tc.hours = tc_start.hours % 24; tc.mins = tc_start.minutes; tc.secs = tc_start.seconds; tc.frame = tc_start.frames; @@ -554,7 +555,7 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end return; } - ltc_enc_pos = tc_sample_start; + ltc_enc_pos = tc_sample_start % wrap24h; DEBUG_TRACE (DEBUG::LTC, string_compose("LTC TX5 restart @ %1 + %2 - %3 | byte %4\n", ltc_enc_pos, ltc_enc_cnt, cyc_off, ltc_enc_byte)); @@ -577,7 +578,7 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end * To do better than this, resampling (or a rewrite of the * encoder) is required. */ - ltc_speed -= ((ltc_enc_pos + ltc_enc_cnt - poff) - cycle_start_frame) / engine().sample_rate(); + ltc_speed -= fmod(((ltc_enc_pos + ltc_enc_cnt - poff) - cycle_start_frame), wrap24h) / engine().sample_rate(); } |