Fix SNAFU with auto-connect. Fixes #3379.

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

diff --git a/libs/ardour/io_processor.cc b/libs/ardour/io_processor.cc
index 21a2b10313d4be15afcdf727b0f227669aa90508..d1b7e9c232103d6c63e7adcb90438ea9efc66142 100644 (file)
--- a/libs/ardour/io_processor.cc
+++ b/libs/ardour/io_processor.cc
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #include <sstream>
 
-#include <sigc++/bind.h>
 
 #include "pbd/xml++.h"
 #include "pbd/enumwriter.h"
@@ -89,7 +88,6 @@ IOProcessor::IOProcessor (Session& s, boost::shared_ptr<IO> in, boost::shared_pt
 
 IOProcessor::~IOProcessor ()
 {
-       notify_callbacks ();
 }
 
 void
@@ -133,7 +131,6 @@ IOProcessor::state (bool full_state)
                node.add_property ("own-output", "yes");
                if (_output) {
                        XMLNode& o (_output->state (full_state));
-                       // o.name() = X_("output");
                        node.add_child_nocopy (o);
                }
        } else {
@@ -166,12 +163,21 @@ IOProcessor::set_state (const XMLNode& node, int version)
 
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
+       const string instr = enum_2_string (IO::Input);
+       const string outstr = enum_2_string (IO::Output);
 
        if (_own_input) {
                for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-                       if ((*niter)->name() == "input") {
-                               io_node = (*niter);
-                               break;
+                       const XMLProperty* prop;
+                       if ((prop = (*niter)->property ("name")) != 0) {
+                               if (_name == prop->value()) {
+                                       if ((prop = (*niter)->property ("direction")) != 0) {
+                                               if (prop->value() == instr) {
+                                                       io_node = (*niter);
+                                                       break;
+                                               }
+                                       }
+                               }
                        }
                }
 
@@ -184,16 +190,25 @@ IOProcessor::set_state (const XMLNode& node, int version)
                        }
 
                } else {
-                       /* no input */
+                       /* no input, which is OK */
                }
 
        }
 
        if (_own_output) {
                for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-                       if ((*niter)->name() == "output") {
-                               io_node = (*niter);
-                               break;
+                       if ((*niter)->name() == "IO") {
+                               const XMLProperty* prop;
+                               if ((prop = (*niter)->property ("name")) != 0) {
+                                       if (_name == prop->value()) {
+                                               if ((prop = (*niter)->property ("direction")) != 0) {
+                                                       if (prop->value() == outstr) {
+                                                               io_node = (*niter);
+                                                               break;
+                                                       }
+                                               }
+                                       }
+                               }
                        }
                }
 
@@ -205,7 +220,7 @@ IOProcessor::set_state (const XMLNode& node, int version)
                                set_name (_output->name());
                        }
                } else {
-                       /* no output */
+                       /* no output, which is OK */
                }
        }