Fix reversed logic in legacy tempo secton detection

[ardour.git] / libs / ardour / vca.cc

diff --git a/libs/ardour/vca.cc b/libs/ardour/vca.cc
index 2c87a80db4c28a8c92ba06316b17fe22c03b706a..3eff1a6b4554512f1274a5ef99ada88dffda9927 100644 (file)
--- a/libs/ardour/vca.cc
+++ b/libs/ardour/vca.cc
@@ -27,14 +27,14 @@
 #include "ardour/session.h"
 #include "ardour/vca.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
 using std::string;
 
 Glib::Threads::Mutex VCA::number_lock;
-uint32_t VCA::next_number = 1;
+int32_t VCA::next_number = 1;
 string VCA::xml_node_name (X_("VCA"));
 
 string
@@ -43,7 +43,7 @@ VCA::default_name_template ()
        return _("VCA %n");
 }
 
-uint32_t
+int32_t
 VCA::next_vca_number ()
 {
        /* we could use atomic inc here, but elsewhere we need more complete
@@ -54,23 +54,22 @@ VCA::next_vca_number ()
 }
 
 void
-VCA::set_next_vca_number (uint32_t n)
+VCA::set_next_vca_number (int32_t n)
 {
        Glib::Threads::Mutex::Lock lm (number_lock);
        next_number = n;
 }
 
-uint32_t
+int32_t
 VCA::get_next_vca_number ()
 {
        Glib::Threads::Mutex::Lock lm (number_lock);
        return next_number;
 }
 
-VCA::VCA (Session& s,  uint32_t num, const string& name)
+VCA::VCA (Session& s, int32_t num, const string& name)
        : Stripable (s, name, PresentationInfo (num, PresentationInfo::VCA))
        , Muteable (s, name)
-       , Automatable (s)
        , _number (num)
        , _gain_control (new GainControl (s, Evoral::Parameter (GainAutomation), boost::shared_ptr<AutomationList> ()))
 {
@@ -103,14 +102,21 @@ VCA::~VCA ()
        }
 }
 
+string
+VCA::full_name() const
+{
+       /* name() is never empty - default is VCA %n */
+       return string_compose (_("VCA %1 : %2"), _number, name());
+}
+
 XMLNode&
 VCA::get_state ()
 {
        XMLNode* node = new XMLNode (xml_node_name);
-       node->add_property (X_("name"), _name);
-       node->add_property (X_("number"), _number);
+       node->set_property (X_("name"), name());
+       node->set_property (X_("number"), _number);
 
-       Stripable::add_state (*node);
+       node->add_child_nocopy (_presentation_info.get_state());
 
        node->add_child_nocopy (_gain_control->get_state());
        node->add_child_nocopy (_solo_control->get_state());
@@ -125,35 +131,30 @@ VCA::get_state ()
 int
 VCA::set_state (XMLNode const& node, int version)
 {
-       XMLProperty const* prop;
-
        Stripable::set_state (node, version);
 
-       if ((prop = node.property ("name")) != 0) {
-               set_name (prop->value());
+       std::string str;
+       if (node.get_property ("name", str)) {
+               set_name (str);
        }
 
-       if ((prop = node.property ("number")) != 0) {
-               _number = atoi (prop->value());
-       }
+       node.get_property ("number", _number);
 
        XMLNodeList const &children (node.children());
        for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
                if ((*i)->name() == Controllable::xml_node_name) {
 
-                       XMLProperty* prop = (*i)->property ("name");
-
-                       if (!prop) {
+                       if (!(*i)->get_property ("name", str)) {
                                continue;
                        }
 
-                       if (prop->value() == _gain_control->name()) {
+                       if (str == _gain_control->name()) {
                                _gain_control->set_state (**i, version);
                        }
-                       if (prop->value() == _solo_control->name()) {
+                       if (str == _solo_control->name()) {
                                _solo_control->set_state (**i, version);
                        }
-                       if (prop->value() == _mute_control->name()) {
+                       if (str == _mute_control->name()) {
                                _mute_control->set_state (**i, version);
                        }
                } else if ((*i)->name() == Slavable::xml_node_name) {