ardour/livetrax
13
0
Fork 0
Code

fix potential absorption of music-locked tempo into meter-locked one.

Browse Source
This commit is contained in:
nick_m 2017-02-05 00:30:13 +11:00
parent efd859a0ee
commit 893d4e7a07
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/tempo.cc
View File

@ -1091,7 +1091,7 @@ TempoMap::replace_tempo (TempoSection& ts, const Tempo& tempo, const double& pul
Glib::Threads::RWLock::WriterLock lm (lock);
TempoSection& first (first_tempo());
if (!ts.initial()) {
if (ts.locked_to_meter()) {
if (locked_to_meter) {
ts.set_type (type);
{
/* cannot move a meter-locked tempo section */
@ -1107,6 +1107,7 @@ TempoMap::replace_tempo (TempoSection& ts, const Tempo& tempo, const double& pul
first.set_pulse (0.0);
first.set_minute (minute_at_frame (frame));
first.set_position_lock_style (AudioTime);
first.set_locked_to_meter (true);
{
/* cannot move the first tempo section */
*static_cast<Tempo*>(&first) = tempo;
@ -1185,6 +1186,7 @@ TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_T
pair<double, BBT_Time> beat = make_pair (0.0, BBT_Time (1, 1, 0));
first.set_beat (beat);
first_t.set_minute (first.minute());
first_t.set_locked_to_meter (true);
first_t.set_pulse (0.0);
first_t.set_position_lock_style (AudioTime);
recompute_map (_metrics);