Fix broken whitespace. I'd apologize for the compile times if it was my fault :D

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

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index 3bc9db024bef1873c5b1d0db710cb38f5a8648b6..bb004c313d3f97beab2ab1f174c9f2c3fa1c29c2 100644 (file)
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -23,7 +23,6 @@
 
 #include <string>
 
-#include <sigc++/bind.h>
 
 #include "pbd/failed_constructor.h"
 #include "pbd/enumwriter.h"
@@ -57,35 +56,34 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-sigc::signal<void,Processor*> Processor::ProcessorCreated;
-
 // Always saved as Processor, but may be IOProcessor or Send in legacy sessions
 const string Processor::state_node_name = "Processor";
 
 Processor::Processor(Session& session, const string& name)
        : SessionObject(session, name)
-       , AutomatableControls(session)
+       , Automatable (session)
        , _pending_active(false)
        , _active(false)
        , _next_ab_is_active(false)
        , _configured(false)
-       , _gui(0)
        , _display_to_user (true)
+       , _pre_fader (false)
+       , _ui_pointer (0)
 {
 }
 
-Processor::Processor (Session& session, const XMLNode& node)
-       : SessionObject(session, "renameMe")
-       , AutomatableControls(session)
-       , _pending_active(false)
-       , _active(false)
+Processor::Processor (const Processor& other)
+       : Evoral::ControlSet (other)
+       , SessionObject (other.session(), other.name())
+       , Automatable (other.session())
+       , _pending_active(other._pending_active)
+       , _active(other._active)
        , _next_ab_is_active(false)
        , _configured(false)
-       , _gui(0)
        , _display_to_user (true)
+       , _pre_fader (false)
+       , _ui_pointer (0)
 {
-       set_state (node, Stateful::loading_state_version);
-       _pending_active = _active;
 }
 
 XMLNode&
@@ -112,7 +110,6 @@ XMLNode&
 Processor::state (bool full_state)
 {
        XMLNode* node = new XMLNode (state_node_name);
-       stringstream sstr;
        char buf[64];
 
        id().print (buf, sizeof (buf));
@@ -125,17 +122,19 @@ 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()) {
 
+                       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());
@@ -166,9 +165,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;
-                                       ActiveChanged (); /* EMIT_SIGNAL */
+                               bool const a = string_is_affirmative (prop->value ());
+                               if (_active != a) {
+                                       if (a) {
+                                               activate ();
+                                       } else {
+                                               deactivate ();
+                                       }
                                }
                        }
                }
@@ -183,13 +186,16 @@ Processor::set_state (const XMLNode& node, int version)
        if (version < 3000) {
                return set_state_2X (node, version);
        }
-       
+
        const XMLProperty *prop;
        const XMLProperty *legacy_active = 0;
 
        // may not exist for legacy 3.0 sessions
        if ((prop = node.property ("name")) != 0) {
-               set_name(prop->value());
+               /* don't let derived classes have a crack at set_name,
+                  as some (like Send) will screw with the one we suggest.
+               */
+               Processor::set_name (prop->value());
        }
 
        // may not exist for legacy 3.0 sessions
@@ -209,7 +215,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) {
@@ -239,8 +245,6 @@ Processor::set_state (const XMLNode& node, int version)
        }
 
        if ((prop = node.property ("active")) == 0) {
-               warning << _("XML node describing a processor is missing the `active' field,"
-                          "trying legacy active flag from child node") << endmsg;
                if (legacy_active) {
                        prop = legacy_active;
                } else {
@@ -249,14 +253,19 @@ Processor::set_state (const XMLNode& node, int version)
                }
        }
 
-       if (_active != string_is_affirmative (prop->value())) {
-               _active = !_active;
-               ActiveChanged (); /* EMIT_SIGNAL */
+       bool const a = string_is_affirmative (prop->value ());
+       if (_active != a) {
+               if (a) {
+                       activate ();
+               } else {
+                       deactivate ();
+               }
        }
 
        return 0;
 }
 
+/** @pre Caller must hold process lock */
 bool
 Processor::configure_io (ChanCount in, ChanCount out)
 {
@@ -269,14 +278,25 @@ Processor::configure_io (ChanCount in, ChanCount out)
        _configured_output = out;
        _configured = true;
 
-       ConfigurationChanged.emit (in, out);
+       ConfigurationChanged (in, out); /* EMIT SIGNAL */
 
        return true;
 }
 
 void
-Processor::set_display_to_user (bool yn) 
+Processor::set_display_to_user (bool yn)
 {
        _display_to_user = yn;
 }
 
+void
+Processor::set_pre_fader (bool p)
+{
+       _pre_fader = p;
+}
+
+void
+Processor::set_ui (void* p)
+{
+       _ui_pointer = p;
+}