ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Try to avoid coincident tempo/meter markers when removing time

Browse Source 
If a tempo or meter marker exists immediately after the range being removed
by a 'remove time' operation, don't try to move the last marker within the
range being removed to the same position.

Ideally, TempoMap::remove_time() should do the same stuff as insert_time()
to make sure that meter changes only occur on bar lines, but that's for
another time.
This commit is contained in:
Colin Fletcher 2015-06-25 17:24:20 +01:00
parent 94e4e2f55f
commit 0613a02e10
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/ardour/tempo.cc
View File

@ -1911,6 +1911,8 @@ TempoMap::remove_time (framepos_t where, framecnt_t amount)
TempoSection* last_tempo = NULL;
MeterSection* last_meter = NULL;
bool tempo_after = false; // is there a tempo marker at the first sample after the removed range?
bool meter_after = false; // is there a meter marker likewise?
{
Glib::Threads::RWLock::WriterLock lm (lock);
for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) {
@ -1924,18 +1926,24 @@ TempoMap::remove_time (framepos_t where, framecnt_t amount)
last_meter = lm;
}
else if ((*i)->frame() >= where) {
// TODO: make sure that moved tempo/meter markers are rounded to beat/bar boundaries
(*i)->set_frame ((*i)->frame() - amount);
if ((*i)->frame() == where) {
// marker was immediately after end of range
tempo_after = dynamic_cast<TempoSection*> (*i);
meter_after = dynamic_cast<MeterSection*> (*i);
}
moved = true;
}
}
//find the last TEMPO and METER metric (if any) and move it to the cut point so future stuff is correct
if (last_tempo) {
if (last_tempo && !tempo_after) {
metric_kill_list.remove(last_tempo);
last_tempo->set_frame(where);
moved = true;
}
if (last_meter) {
if (last_meter && !meter_after) {
metric_kill_list.remove(last_meter);
last_meter->set_frame(where);
moved = true;