From 5aafb0b53486a92a4e966510388d9c7cfbb799fb Mon Sep 17 00:00:00 2001 From: nick_m Date: Wed, 9 Nov 2016 01:10:21 +1100 Subject: remove recently added xml nodes. --- libs/ardour/tempo.cc | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 51b9111878..bd23e02ebd 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; - double minute; bool had_beats_per_minute = false; _legacy_bbt = BBT_Time (0, 0, 0); @@ -129,14 +128,6 @@ TempoSection::TempoSection (const XMLNode& node, framecnt_t sample_rate) } } - if ((prop = node.property ("minute")) != 0) { - if (sscanf (prop->value().c_str(), "%lf", &minute) != 1) { - error << _("TempoSection XML node has an illegal \"minute\" value") << endmsg; - } else { - set_minute (minute); - } - } - /* replace old beats-per-minute 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; @@ -215,8 +206,6 @@ TempoSection::get_state() const root->add_property ("pulse", buf); snprintf (buf, sizeof (buf), "%li", frame()); root->add_property ("frame", buf); - snprintf (buf, sizeof (buf), "%lf", minute()); - root->add_property ("minute", buf); snprintf (buf, sizeof (buf), "%lf", _note_types_per_minute); root->add_property ("note-types-per-minute", buf); snprintf (buf, sizeof (buf), "%lf", _note_type); @@ -522,7 +511,6 @@ MeterSection::MeterSection (const XMLNode& node, const framecnt_t sample_rate) double beat = 0.0; framepos_t frame = 0; pair start; - double minute = 0.0; if ((prop = node.property ("start")) != 0) { if (sscanf (prop->value().c_str(), "%" PRIu32 "|%" PRIu32 "|%" PRIu32, @@ -572,13 +560,6 @@ MeterSection::MeterSection (const XMLNode& node, const framecnt_t sample_rate) set_minute (minute_at_frame (frame)); } } - if ((prop = node.property ("minute")) != 0) { - if (sscanf (prop->value().c_str(), "%lf", &minute) != 1) { - error << _("MeterSection XML node has an illegal \"frame\" value") << endmsg; - } else { - set_minute (minute); - } - } /* beats-per-bar is old; divisions-per-bar is new */ @@ -641,8 +622,6 @@ MeterSection::get_state() const root->add_property ("note-type", buf); snprintf (buf, sizeof (buf), "%li", frame()); root->add_property ("frame", buf); - snprintf (buf, sizeof (buf), "%lf", minute()); - root->add_property ("minute", buf); root->add_property ("lock-style", enum_2_string (position_lock_style())); snprintf (buf, sizeof (buf), "%lf", _divisions_per_bar); root->add_property ("divisions-per-bar", buf); -- cgit v1.2.3