properly calculate requrired thread buffers

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

diff --git a/libs/ardour/io_processor.cc b/libs/ardour/io_processor.cc
index 91247d5082dd62c6c993f524e4b2945817075813..6a6f09bbe21b5787f11d9a3ef215d0b0d394a330 100644 (file)
--- a/libs/ardour/io_processor.cc
+++ b/libs/ardour/io_processor.cc
@@ -17,25 +17,20 @@
 
 */
 
-#include <fstream>
-#include <algorithm>
+#include <list>
 #include <string>
-#include <cerrno>
-#include <unistd.h>
-#include <sstream>
-
 
 #include "pbd/xml++.h"
 #include "pbd/enumwriter.h"
 
-#include "ardour/io_processor.h"
-#include "ardour/session.h"
-#include "ardour/utils.h"
-#include "ardour/send.h"
-#include "ardour/port_insert.h"
-#include "ardour/plugin_insert.h"
+#include "ardour/chan_count.h"
+#include "ardour/data_type.h"
 #include "ardour/io.h"
+#include "ardour/io_processor.h"
+#include "ardour/processor.h"
 #include "ardour/route.h"
+#include "ardour/session_object.h"
+#include "ardour/types.h"
 
 #include "i18n.h"
 
@@ -43,10 +38,12 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+namespace ARDOUR { class Session; }
+
 /* create an IOProcessor that proxies to a new IO object */
 
 IOProcessor::IOProcessor (Session& s, bool with_input, bool with_output,
-                         const string& proc_name, const string io_name, DataType dtype)
+                         const string& proc_name, const string io_name, DataType dtype, bool sendish)
        : Processor(s, proc_name)
 {
        /* these are true in this constructor whether we actually create the associated
@@ -57,11 +54,11 @@ IOProcessor::IOProcessor (Session& s, bool with_input, bool with_output,
        _own_output = true;
 
        if (with_input) {
-               _input.reset (new IO(s, io_name.empty() ? proc_name : io_name, IO::Input, dtype));
+               _input.reset (new IO(s, io_name.empty() ? proc_name : io_name, IO::Input, dtype, sendish));
        }
 
        if (with_output) {
-               _output.reset (new IO(s, io_name.empty() ? proc_name : io_name, IO::Output, dtype));
+               _output.reset (new IO(s, io_name.empty() ? proc_name : io_name, IO::Output, dtype, sendish));
        }
 }
 
@@ -146,11 +143,16 @@ IOProcessor::state (bool full_state)
 int
 IOProcessor::set_state (const XMLNode& node, int version)
 {
+       if (version < 3000) {
+               return set_state_2X (node, version);
+       }
+
        const XMLProperty *prop;
        const XMLNode *io_node = 0;
 
        Processor::set_state(node, version);
 
+
        if ((prop = node.property ("own-input")) != 0) {
                _own_input = string_is_affirmative (prop->value());
        }
@@ -166,11 +168,11 @@ IOProcessor::set_state (const XMLNode& node, int version)
        const string instr = enum_2_string (IO::Input);
        const string outstr = enum_2_string (IO::Output);
 
-       if (_own_input) {
+       if (_own_input && _input) {
                for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
                        const XMLProperty* prop;
                        if ((prop = (*niter)->property ("name")) != 0) {
-                               if (prop->value() == _name) {
+                               if (_name == prop->value()) {
                                        if ((prop = (*niter)->property ("direction")) != 0) {
                                                if (prop->value() == instr) {
                                                        io_node = (*niter);
@@ -195,12 +197,12 @@ IOProcessor::set_state (const XMLNode& node, int version)
 
        }
 
-       if (_own_output) {
+       if (_own_output && _output) {
                for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
                        if ((*niter)->name() == "IO") {
                                const XMLProperty* prop;
                                if ((prop = (*niter)->property ("name")) != 0) {
-                                       if (prop->value() == _name) {
+                                       if (_name == prop->value()) {
                                                if ((prop = (*niter)->property ("direction")) != 0) {
                                                        if (prop->value() == outstr) {
                                                                io_node = (*niter);
@@ -227,14 +229,32 @@ IOProcessor::set_state (const XMLNode& node, int version)
        return 0;
 }
 
+int
+IOProcessor::set_state_2X (const XMLNode& node, int version)
+{
+       _own_input = _own_output = true;
+
+       Processor::set_state_2X (node, version);
+
+       return 0;
+}
+
 void
-IOProcessor::silence (nframes_t nframes)
+IOProcessor::silence (framecnt_t nframes)
 {
        if (_own_output && _output) {
                _output->silence (nframes);
        }
 }
 
+void
+IOProcessor::increment_port_buffer_offset (pframes_t offset)
+{
+        if (_own_output && _output) {
+                _output->increment_port_buffer_offset (offset);
+        }
+}
+
 ChanCount
 IOProcessor::natural_output_streams() const
 {
@@ -280,3 +300,21 @@ IOProcessor::disconnect ()
                _output->disconnect (this);
        }
 }
+
+/** Set up the XML description of a send so that we will not
+ *  reset its name or bitslot during ::set_state()
+ *  @param state XML send state.
+ *  @param session Session.
+ */
+void
+IOProcessor::prepare_for_reset (XMLNode &state, const std::string& name)
+{
+       state.add_property ("ignore-bitslot", "1");
+       state.add_property ("ignore-name", "1");
+
+       XMLNode* io_node = state.child (IO::state_node_name.c_str());
+
+       if (io_node) {
+               IO::prepare_for_reset (*io_node, name);
+       }
+}