diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-05-23 05:30:39 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2017-05-23 05:30:39 +1000 |
| commit | 1a31134d38b9a88cc83a38f8d0410e23e30e4f40 (patch) | |
| tree | f2562d7c7a73e0e2c5b43634b16d33c1a98aedac /libs/ardour/tempo.cc | |
| parent | b3fb75feadf28e35c302149778b544172f808a09 (diff) | |
Fix failure to laod old tempo maps
I suspect this happened after an api change.
Now, just use the position pair instead of a whole new variable.
Diffstat (limited to 'libs/ardour/tempo.cc')
| -rw-r--r-- | libs/ardour/tempo.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 84fcaa1183..d1378ed9ca 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -553,14 +553,14 @@ MeterSection::MeterSection (const XMLNode& node, const framecnt_t sample_rate) { LocaleGuard lg; pair<double, BBT_Time> start; + start.first = 0.0; - BBT_Time bbt; std::string 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*/ info << _("Legacy session detected - MeterSection XML node will be altered.") << endmsg; - set_pulse(-1.0); + set_pulse (-1.0); } else { 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); - start.first = 0.0; node.get_property ("beat", start.first); if (node.get_property ("bbt", bbt_str)) { |