diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-09 16:29:23 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-09 16:29:23 -0400 |
commit | f0fcda204444922fc0e1261929aa6fdb84412036 (patch) | |
tree | beeeb2bc14c99c4b0b333980b693f22dab8314cb /libs/ardour/session_ltc.cc | |
parent | 4dc1bbff359308ad884c9429d155f772ebb89bc4 (diff) | |
parent | c4227ca706405a79faf43a1d667a6f017388f8af (diff) |
Merge branch 'master' into audioengine
Diffstat (limited to 'libs/ardour/session_ltc.cc')
-rw-r--r-- | libs/ardour/session_ltc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/session_ltc.cc b/libs/ardour/session_ltc.cc index d52d9e919a..b2fbaf602c 100644 --- a/libs/ardour/session_ltc.cc +++ b/libs/ardour/session_ltc.cc @@ -496,7 +496,7 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end DEBUG_TRACE (DEBUG::LTC, string_compose("LTC TX4: now: %1 trs: %2 toff %3\n", cycle_start_frame, tc_sample_start, soff)); - uint32_t cyc_off; + int32_t cyc_off; if (soff < 0 || soff >= fptcf) { /* session framerate change between (2) and now */ ltc_tx_reset(); @@ -532,7 +532,7 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end restarting = true; } - if (cyc_off >= 0 && cyc_off <= nframes) { + if (cyc_off >= 0 && cyc_off <= (int32_t) nframes) { /* offset in this cycle */ txf= rint(cyc_off / fabs(ltc_speed)); memset(out, 0, cyc_off * sizeof(Sample)); |