diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-13 02:53:14 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-13 02:53:14 +0000 |
| commit | 08c7f0b2bc159b3b46a82decc137b79cafda2eec (patch) | |
| tree | 92b781b47f7ae787a7e36f01783b3aa661b70eb0 /libs | |
| parent | e0cf3b6354e2c92a6adabe85cb6d6d3c547c287c (diff) | |
fix up XML property name for Meter::beats_per_bar (w/backward compat)
git-svn-id: svn://localhost/ardour2/branches/3.0@10996 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/tempo.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 1c36f129b4..e811692a77 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -167,13 +167,17 @@ MeterSection::MeterSection (const XMLNode& node) set_start (start); - if ((prop = node.property ("beats-per-bar")) == 0) { - error << _("MeterSection XML node has no \"beats-per-bar\" property") << endmsg; - throw failed_constructor(); + /* beats-per-bar is old; divisions-per-bar is new */ + + if ((prop = node.property ("divisions-per-bar")) == 0) { + if ((prop = node.property ("beats-per-bar")) == 0) { + error << _("MeterSection XML node has no \"beats-per-bar\" or \"divisions-per-bar\" property") << endmsg; + throw failed_constructor(); + } } if (sscanf (prop->value().c_str(), "%lf", &_divisions_per_bar) != 1 || _divisions_per_bar < 0.0) { - error << _("MeterSection XML node has an illegal \"beats-per-bar\" value") << endmsg; + error << _("MeterSection XML node has an illegal \"beats-per-bar\" or \"divisions-per-bar\" value") << endmsg; throw failed_constructor(); } @@ -210,7 +214,7 @@ MeterSection::get_state() const snprintf (buf, sizeof (buf), "%f", _note_type); root->add_property ("note-type", buf); snprintf (buf, sizeof (buf), "%f", _divisions_per_bar); - root->add_property ("beats-per-bar", buf); + root->add_property ("divisions-per-bar", buf); snprintf (buf, sizeof (buf), "%s", movable()?"yes":"no"); root->add_property ("movable", buf); |