ardour/livetrax
13
0
Fork 0
Code

do not add in ticks in the "at" position when computing BBT duration somewhere on the timeline (fixes issues with nudging etc.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13201 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-10-01 20:55:10 +00:00
parent 02a98547f1
commit a63d01e24a
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/audio_clock.cc
View File

@ -1914,7 +1914,7 @@ AudioClock::frame_duration_from_bbt_string (framepos_t pos, const string& str) c
if (sscanf (str.c_str(), BBT_SCANF_FORMAT, &bbt.bars, &bbt.beats, &bbt.ticks) != 3) { if (sscanf (str.c_str(), BBT_SCANF_FORMAT, &bbt.bars, &bbt.beats, &bbt.ticks) != 3) {
return 0; return 0;
} }
return _session->tempo_map().bbt_duration_at(pos,bbt,1); return _session->tempo_map().bbt_duration_at(pos,bbt,1);
} }

14
libs/ardour/tempo.cc
View File

@ -1203,16 +1203,9 @@ TempoMap::bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, i
/* round back to the previous precise beat */ /* round back to the previous precise beat */
BBTPointList::const_iterator wi = bbt_before_or_at (BBT_Time (when.bars, when.beats, 0)); BBTPointList::const_iterator wi = bbt_before_or_at (BBT_Time (when.bars, when.beats, 0));
BBTPointList::const_iterator start (wi); BBTPointList::const_iterator start (wi);
double tick_frames = 0;
assert (wi != _map.end()); assert (wi != _map.end());
/* compute how much rounding we did because of non-zero ticks */
if (when.ticks != 0) {
tick_frames = (*wi).tempo->frames_per_beat (_frame_rate) * (when.ticks/BBT_Time::ticks_per_beat);
}
uint32_t bars = 0; uint32_t bars = 0;
uint32_t beats = 0; uint32_t beats = 0;
@ -1233,10 +1226,11 @@ TempoMap::bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, i
/* add any additional frames related to ticks in the added value */ /* add any additional frames related to ticks in the added value */
if (bbt.ticks != 0) { if (bbt.ticks != 0) {
tick_frames += (*wi).tempo->frames_per_beat (_frame_rate) * (bbt.ticks/BBT_Time::ticks_per_beat); return ((*wi).frame - (*start).frame) +
(*wi).tempo->frames_per_beat (_frame_rate) * (bbt.ticks/BBT_Time::ticks_per_beat);
} else {
return ((*wi).frame - (*start).frame);
} }
return ((*wi).frame - (*start).frame) + llrint (tick_frames);
} }
framepos_t framepos_t