Handle overlaps better when executing DiffCommands.

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

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index 49a2faa7429495400beedd69a5592cdccb5c17a4..86f63d5a2f66ce7402b76c26dbd8f816be072efe 100644 (file)
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -66,7 +66,6 @@ Processor::Processor(Session& session, const string& name)
        , _active(false)
        , _next_ab_is_active(false)
        , _configured(false)
-       , _gui(0)
        , _display_to_user (true)
        , _pre_fader (false)
 {
@@ -108,7 +107,7 @@ Processor::state (bool full_state)
        }
 
        if (full_state) {
-               XMLNode& automation = Automatable::get_automation_state();
+               XMLNode& automation = Automatable::get_automation_xml_state();
                if (!automation.children().empty()
                                || !automation.properties().empty()
                                || !_visible_controls.empty()) {
@@ -116,10 +115,11 @@ Processor::state (bool full_state)
                        stringstream sstr;
                        for (set<Evoral::Parameter>::iterator x = _visible_controls.begin();
                                        x != _visible_controls.end(); ++x) {
+                                
                                if (x != _visible_controls.begin()) {
                                        sstr << ' ';
                                }
-                               sstr << *x;
+                               sstr << (*x).id();
                        }
 
                        automation.add_property ("visible", sstr.str());
@@ -150,10 +150,13 @@ Processor::set_state_2X (const XMLNode & node, int /*version*/)
                        }
 
                        if ((prop = (*i)->property ("active")) != 0) {
-                               if (_active != string_is_affirmative (prop->value())) {
-                                       _active = !_active;
-                                        _pending_active = _active;
-                                       ActiveChanged (); /* EMIT_SIGNAL */
+                               bool const a = string_is_affirmative (prop->value ());
+                               if (_active != a) {
+                                       if (a) {
+                                               activate ();
+                                       } else {
+                                               deactivate ();
+                                       }
                                }
                        }
                }
@@ -194,7 +197,7 @@ Processor::set_state (const XMLNode& node, int version)
                        if ((prop = (*niter)->property ("path")) != 0) {
                                old_set_automation_state (*(*niter));
                        } else {
-                               set_automation_state (*(*niter), Evoral::Parameter(PluginAutomation));
+                               set_automation_xml_state (*(*niter), Evoral::Parameter(PluginAutomation));
                        }
 
                        if ((prop = (*niter)->property ("visible")) != 0) {
@@ -232,10 +235,13 @@ Processor::set_state (const XMLNode& node, int version)
                }
        }
 
-       if (_active != string_is_affirmative (prop->value())) {
-               _active = !_active;
-                _pending_active = _active;
-               ActiveChanged (); /* EMIT_SIGNAL */
+       bool const a = string_is_affirmative (prop->value ());
+       if (_active != a) {
+               if (a) {
+                       activate ();
+               } else {
+                       deactivate ();
+               }
        }
 
        return 0;