ardour/livetrax
13
0
Fork 0
Code

Prevent duplicate meters when importing tempo-map #8449

Browse Source 
The file linked from the bug report has a meter-change
in the middle of a bar. Ardour maps this back to the previous
bar, which already has a meter-change. Session load fails with
  "Multiple meter definitions found at 473"

The tempo-map of the file ends like this:
```
  Meter 11/32 @227040 (beat 473)
  Meter 4 / 4 @227680 (beat 483.666667)
```
This commit is contained in:
Robin Gareus 2020-11-11 18:48:51 +01:00
parent 54baa620c4
commit d3eab4e309
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/tempo.cc
View File

@ -1231,8 +1231,9 @@ TempoMap::add_meter_locked (const Meter& meter, const BBT_Time& bbt, samplepos_t
if (!solved && recompute) {
/* if this has failed to solve, there is little we can do other than to ensure that
the new map is recalculated.
*/
* the new map is valid and recalculated.
*/
remove_meter_locked (*new_meter);
warning << "Adding meter may have left the tempo map unsolved." << endmsg;
recompute_map (_metrics);
}