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 e5616987c6428e4bef5874a39b97155911eaf9b0..bb004c313d3f97beab2ab1f174c9f2c3fa1c29c2 100644 (file)
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -68,6 +68,21 @@ Processor::Processor(Session& session, const string& name)
        , _configured(false)
        , _display_to_user (true)
        , _pre_fader (false)
+       , _ui_pointer (0)
+{
+}
+
+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)
+       , _display_to_user (true)
+       , _pre_fader (false)
+       , _ui_pointer (0)
 {
 }
 
@@ -115,7 +130,7 @@ 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 << ' ';
                                }
@@ -171,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
@@ -247,7 +265,7 @@ Processor::set_state (const XMLNode& node, int version)
        return 0;
 }
 
-/** Caller must hold process lock */
+/** @pre Caller must hold process lock */
 bool
 Processor::configure_io (ChanCount in, ChanCount out)
 {
@@ -266,7 +284,7 @@ Processor::configure_io (ChanCount in, ChanCount out)
 }
 
 void
-Processor::set_display_to_user (bool yn) 
+Processor::set_display_to_user (bool yn)
 {
        _display_to_user = yn;
 }
@@ -276,3 +294,9 @@ Processor::set_pre_fader (bool p)
 {
        _pre_fader = p;
 }
+
+void
+Processor::set_ui (void* p)
+{
+       _ui_pointer = p;
+}