smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 20:56:28 +01:00
Code Issues Projects Releases Wiki Activity

Fix failure to laod old tempo maps

Browse source 
I suspect this happened after an api change.
Now, just use the position pair instead of a whole new variable.
This commit is contained in:
nick_m 2017-05-23 05:30:39 +10:00
parent b3fb75fead
commit 1a31134d38
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/ardour/tempo.cc
View file

@ -553,14 +553,14 @@ MeterSection::MeterSection (const XMLNode& node, const framecnt_t sample_rate)
{ {
LocaleGuard lg; LocaleGuard lg;
pair<double, BBT_Time> start; pair<double, BBT_Time> start;
start.first = 0.0;
BBT_Time bbt;
std::string bbt_str; std::string bbt_str;
if (node.get_property ("start", bbt_str)) { if (node.get_property ("start", bbt_str)) {
if (string_to_bbt_time (bbt_str, bbt)) { if (string_to_bbt_time (bbt_str, start.second)) {
/* legacy session - start used to be in bbt*/ /* legacy session - start used to be in bbt*/
info << _("Legacy session detected - MeterSection XML node will be altered.") << endmsg; info << _("Legacy session detected - MeterSection XML node will be altered.") << endmsg;
set_pulse(-1.0); set_pulse (-1.0);
} else { } else {
error << _("MeterSection XML node has an illegal \"start\" value") << endmsg; error << _("MeterSection XML node has an illegal \"start\" value") << endmsg;
} }
@ -568,7 +568,6 @@ MeterSection::MeterSection (const XMLNode& node, const framecnt_t sample_rate)
MetricSection::set_state (node, Stateful::loading_state_version); MetricSection::set_state (node, Stateful::loading_state_version);
start.first = 0.0;
node.get_property ("beat", start.first); node.get_property ("beat", start.first);
if (node.get_property ("bbt", bbt_str)) { if (node.get_property ("bbt", bbt_str)) {