first part of MIDI cut/copy/paste ; fix for input/output_streams of an IOProcessor...

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

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index 63848e8c407fbd2ac952293d505fa275c2e4727a..101bc29ab44b887b1348625c30311c445801514a 100644 (file)
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -17,6 +17,10 @@
 
 */
 
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
 #include <string>
 
 #include <sigc++/bind.h>
@@ -58,30 +62,28 @@ 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, Placement p)
+Processor::Processor(Session& session, const string& name)
        : SessionObject(session, name)
        , AutomatableControls(session)
+       , _pending_active(false)
        , _active(false)
        , _next_ab_is_active(false)
        , _configured(false)
-       , _placement(p)
        , _gui(0)
 {
 }
 
-void
-Processor::set_sort_key (uint32_t key)
-{
-       _sort_key = key;
-}
-       
-void
-Processor::set_placement (Placement p)
+Processor::Processor (Session& session, const XMLNode& node)
+       : SessionObject(session, "renameMe")
+       , AutomatableControls(session)
+       , _pending_active(false)
+       , _active(false)
+       , _next_ab_is_active(false)
+       , _configured(false)
+       , _gui(0)
 {
-       if (_placement != p) {
-               _placement = p;
-                PlacementChanged (); /* EMIT SIGNAL */
-       }
+       set_state (node);
+       _pending_active = _active;
 }
 
 XMLNode&
@@ -109,37 +111,34 @@ Processor::state (bool full_state)
 {
        XMLNode* node = new XMLNode (state_node_name);
        stringstream sstr;
-       
-       // FIXME: This conflicts with "id" used by plugin for name in legacy sessions (ugh).
-       // Do we need to serialize this?
-       /*
        char buf[64];
+       
        id().print (buf, sizeof (buf));
        node->add_property("id", buf);
-       */
-
        node->add_property("name", _name);
        node->add_property("active", active() ? "yes" : "no");  
-       node->add_property("placement", enum_2_string (_placement));
 
        if (_extra_xml){
                node->add_child_copy (*_extra_xml);
        }
        
        if (full_state) {
-
                XMLNode& automation = Automatable::get_automation_state(); 
-               
-               for (set<Evoral::Parameter>::iterator x = _visible_controls.begin(); x != _visible_controls.end(); ++x) {
-                       if (x != _visible_controls.begin()) {
-                               sstr << ' ';
+               if (!automation.children().empty()
+                               || !automation.properties().empty()
+                               || !_visible_controls.empty()) {
+
+                       for (set<Evoral::Parameter>::iterator x = _visible_controls.begin();
+                                       x != _visible_controls.end(); ++x) {
+                               if (x != _visible_controls.begin()) {
+                                       sstr << ' ';
+                               }
+                               sstr << *x;
                        }
-                       sstr << *x;
-               }
 
-               automation.add_property ("visible", sstr.str());
-
-               node->add_child_nocopy (automation);
+                       automation.add_property ("visible", sstr.str());
+                       node->add_child_nocopy (automation);
+               }
        }
 
        return *node;
@@ -150,13 +149,17 @@ Processor::set_state (const XMLNode& node)
 {
        const XMLProperty *prop;
        const XMLProperty *legacy_active = 0;
-       const XMLProperty *legacy_placement = 0;
 
-       // may not exist for legacy sessions
+       // may not exist for legacy 3.0 sessions
        if ((prop = node.property ("name")) != 0) {
                set_name(prop->value());
        }
 
+       // may not exist for legacy 3.0 sessions
+       if ((prop = node.property ("id")) != 0) {
+               _id = prop->value();
+       } 
+
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
 
@@ -164,7 +167,6 @@ Processor::set_state (const XMLNode& node)
 
                if ((*niter)->name() == X_("Automation")) {
 
-
                        XMLProperty *prop;
                        
                        if ((prop = (*niter)->property ("path")) != 0) {
@@ -196,14 +198,12 @@ Processor::set_state (const XMLNode& node)
                        if ( !(legacy_active = (*niter)->property("active"))) {
                                error << string_compose(_("No %1 property flag in element %2"), "active", (*niter)->name()) << endl;
                        }
-                       if ( !(legacy_placement = (*niter)->property("placement"))) {
-                               error << string_compose(_("No %1 property flag in element %2"), "placement", (*niter)->name()) << endl;
-                       }
                }
        }
 
        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;
+               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 {
@@ -217,31 +217,6 @@ Processor::set_state (const XMLNode& node)
                ActiveChanged (); /* EMIT_SIGNAL */
        }       
 
-       if ((prop = node.property ("placement")) == 0) {
-               warning << _("XML node describing a processor is missing the `placement' field, trying legacy placement flag from child node") << endmsg;
-               if (legacy_placement) {
-                       prop = legacy_placement; 
-               } else {
-                       error << _("No child node with placement property") << endmsg;
-                       return -1;
-               }
-       }
-
-       /* hack to handle older sessions before we only used EnumWriter */
-
-       string pstr;
-
-       if (prop->value() == "pre") {
-               pstr = "PreFader";
-       } else if (prop->value() == "post") {
-               pstr = "PostFader";
-       } else {
-               pstr = prop->value();
-       }
-
-       Placement p = Placement (string_2_enum (pstr, p));
-       set_placement (p);
-
        return 0;
 }
 
@@ -250,12 +225,15 @@ Processor::configure_io (ChanCount in, ChanCount out)
 {
        /* This class assumes 1:1 input:output.static output stream count.
           Derived classes must override and set _configured_output appropriately
-          if this is not the case */
+          if this is not the case 
+       */
 
        _configured_input = in; 
        _configured_output = out; 
        _configured = true;
 
+       std::cerr << "******* CONF IN for " << _name << " set to " << in << std::endl;
+
        ConfigurationChanged.emit (in, out);
 
        return true;