Various tweaks to the bundle manager.

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

diff --git a/libs/ardour/io_processor.cc b/libs/ardour/io_processor.cc
index cfa2b4c689ef177c1100785407d5814d7dd544e7..21a2b10313d4be15afcdf727b0f227669aa90508 100644 (file)
--- a/libs/ardour/io_processor.cc
+++ b/libs/ardour/io_processor.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001 Paul Davis 
+    Copyright (C) 2001 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -64,19 +64,16 @@ IOProcessor::IOProcessor (Session& s, bool with_input, bool with_output,
        if (with_output) {
                _output.reset (new IO(s, io_name.empty() ? proc_name : io_name, IO::Output, dtype));
        }
-
-       cerr << "fresh create IOP name = " << proc_name << " in = " << _input << " out = " << _output << endl;
 }
 
 /* create an IOProcessor that proxies to an existing IO object */
 
-IOProcessor::IOProcessor (Session& s, boost::shared_ptr<IO> in, boost::shared_ptr<IO> out, 
-                         const string& proc_name, DataType dtype)
+IOProcessor::IOProcessor (Session& s, boost::shared_ptr<IO> in, boost::shared_ptr<IO> out,
+                         const string& proc_name, DataType /*dtype*/)
        : Processor(s, proc_name)
        , _input (in)
        , _output (out)
 {
-       cerr << "XML create IOP name = " << proc_name << " in = " << in << " out = " << out << endl;
        if (in) {
                _own_input = false;
        } else {
@@ -117,7 +114,7 @@ XMLNode&
 IOProcessor::state (bool full_state)
 {
        XMLNode& node (Processor::state (full_state));
-       
+
        if (_own_input) {
                node.add_property ("own-input", "yes");
                if (_input) {
@@ -131,7 +128,7 @@ IOProcessor::state (bool full_state)
                        node.add_property ("input", _input->name());
                }
        }
-       
+
        if (_own_output) {
                node.add_property ("own-output", "yes");
                if (_output) {
@@ -150,28 +147,26 @@ IOProcessor::state (bool full_state)
 }
 
 int
-IOProcessor::set_state (const XMLNode& node)
+IOProcessor::set_state (const XMLNode& node, int version)
 {
        const XMLProperty *prop;
        const XMLNode *io_node = 0;
 
-       Processor::set_state(node);
+       Processor::set_state(node, version);
 
        if ((prop = node.property ("own-input")) != 0) {
-               _own_input = (prop->value() == "yes");
+               _own_input = string_is_affirmative (prop->value());
        }
 
        if ((prop = node.property ("own-output")) != 0) {
-               _own_output = (prop->value() == "yes");
+               _own_output = string_is_affirmative (prop->value());
        }
 
-       cerr << _name << " own input = " << _own_input << " output = " << _own_output << endl;
-       
        /* don't attempt to set state for a proxied IO that we don't own */
 
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
-       
+
        if (_own_input) {
                for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
                        if ((*niter)->name() == "input") {
@@ -179,21 +174,21 @@ IOProcessor::set_state (const XMLNode& node)
                                break;
                        }
                }
-               
+
                if (io_node) {
-                       _input->set_state(*io_node);
-                       
+                       _input->set_state(*io_node, version);
+
                        // legacy sessions: use IO name
                        if ((prop = node.property ("name")) == 0) {
                                set_name (_input->name());
                        }
-                       
+
                } else {
                        /* no input */
                }
 
        }
-       
+
        if (_own_output) {
                for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
                        if ((*niter)->name() == "output") {
@@ -201,10 +196,10 @@ IOProcessor::set_state (const XMLNode& node)
                                break;
                        }
                }
-               
+
                if (io_node) {
-                       _output->set_state(*io_node);
-                       
+                       _output->set_state(*io_node, version);
+
                        // legacy sessions: use IO name
                        if ((prop = node.property ("name")) == 0) {
                                set_name (_output->name());
@@ -225,18 +220,6 @@ IOProcessor::silence (nframes_t nframes)
        }
 }
 
-ChanCount
-IOProcessor::output_streams() const
-{
-       return _output ? _output->n_ports() : ChanCount::ZERO;
-}
-
-ChanCount
-IOProcessor::input_streams () const
-{
-       return _input ? _input->n_ports() : ChanCount::ZERO;
-}
-
 ChanCount
 IOProcessor::natural_output_streams() const
 {
@@ -270,3 +253,15 @@ IOProcessor::feeds (boost::shared_ptr<Route> other) const
 {
        return _output && _output->connected_to (other->input());
 }
+
+void
+IOProcessor::disconnect ()
+{
+       if (_input) {
+               _input->disconnect (this);
+       }
+
+       if (_output) {
+               _output->disconnect (this);
+       }
+}