diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-11-09 01:42:33 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-11-11 03:37:08 +1100 |
| commit | a5dc7a01d3b176d008d822d6926c1c5062ffda50 (patch) | |
| tree | da25f6d83f38a85fd0d229d436e8f8be6859c3c4 /libs/ardour | |
| parent | e8042f584367550843306cc1c11c25d796219a37 (diff) | |
TempoSection note-types-per-minute node name goes back to beats-per-minute for now.
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/tempo.cc | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index ad894708f8..d8cb26d53a 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -96,7 +96,6 @@ TempoSection::TempoSection (const XMLNode& node, framecnt_t sample_rate) BBT_Time bbt; double pulse; uint32_t frame; - bool had_beats_per_minute = false; _legacy_bbt = BBT_Time (0, 0, 0); @@ -123,29 +122,18 @@ TempoSection::TempoSection (const XMLNode& node, framecnt_t sample_rate) if ((prop = node.property ("frame")) != 0) { if (sscanf (prop->value().c_str(), "%" PRIu32, &frame) != 1) { error << _("TempoSection XML node has an illegal \"frame\" value") << endmsg; + throw failed_constructor(); } else { set_minute (minute_at_frame (frame)); } } - /* replace old beats-per-minute with note-types-per-minute */ + /* XX replace old beats-per-minute name with note-types-per-minute */ if ((prop = node.property ("beats-per-minute")) != 0) { - info << _("Renaming legacy \"beats-per-minute\" XML node to note-types-per-minute") << endmsg; if (sscanf (prop->value().c_str(), "%lf", &_note_types_per_minute) != 1 || _note_types_per_minute < 0.0) { error << _("TempoSection XML node has an illegal \"beats-per-minutee\" value") << endmsg; throw failed_constructor(); } - had_beats_per_minute = true; - } - - if ((prop = node.property ("note-types-per-minute")) != 0) { - if (sscanf (prop->value().c_str(), "%lf", &_note_types_per_minute) != 1 || _note_types_per_minute < 0.0) { - error << _("TempoSection XML node has an illegal \"note-types-per-minute\" value") << endmsg; - throw failed_constructor(); - } - } else if (!had_beats_per_minute) { - error << _("TempoSection XML node has no \"note-types-per-minute\" or \"beats-per-minute\" property") << endmsg; - throw failed_constructor(); } if ((prop = node.property ("note-type")) == 0) { @@ -207,7 +195,7 @@ TempoSection::get_state() const snprintf (buf, sizeof (buf), "%li", frame()); root->add_property ("frame", buf); snprintf (buf, sizeof (buf), "%lf", _note_types_per_minute); - root->add_property ("note-types-per-minute", buf); + root->add_property ("beats-per-minute", buf); snprintf (buf, sizeof (buf), "%lf", _note_type); root->add_property ("note-type", buf); snprintf (buf, sizeof (buf), "%s", movable()?"yes":"no"); @@ -556,6 +544,7 @@ MeterSection::MeterSection (const XMLNode& node, const framecnt_t sample_rate) if ((prop = node.property ("frame")) != 0) { if (sscanf (prop->value().c_str(), "%li", &frame) != 1) { error << _("MeterSection XML node has an illegal \"frame\" value") << endmsg; + throw failed_constructor(); } else { set_minute (minute_at_frame (frame)); } |