Small steps towards rolling backwards..

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

diff --git a/libs/ardour/io_processor.cc b/libs/ardour/io_processor.cc
index be393f1432995d86957de58bd62acb20b81bf273..9a162e3f8bc6f6b7121b76f50530f5ba48bd817e 100644 (file)
--- a/libs/ardour/io_processor.cc
+++ b/libs/ardour/io_processor.cc
@@ -106,15 +106,15 @@ IOProcessor::set_output (boost::shared_ptr<IO> io)
 }
 
 XMLNode&
-IOProcessor::state (bool full_state)
+IOProcessor::state ()
 {
-       XMLNode& node (Processor::state (full_state));
+       XMLNode& node (Processor::state ());
 
        node.set_property ("own-input", _own_input);
 
        if (_input) {
                if (_own_input) {
-                       XMLNode& i (_input->state (full_state));
+                       XMLNode& i (_input->get_state ());
                        // i.name() = X_("output");
                        node.add_child_nocopy (i);
                } else {
@@ -126,7 +126,7 @@ IOProcessor::state (bool full_state)
 
        if (_output) {
                if (_own_output) {
-                       XMLNode& o (_output->state (full_state));
+                       XMLNode& o (_output->get_state ());
                        node.add_child_nocopy (o);
                } else {
                        node.set_property ("output", _output->name ());
@@ -163,7 +163,7 @@ IOProcessor::set_state (const XMLNode& node, int version)
        std::string str;
        if (_own_input && _input) {
                for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-                       if ((*niter)->get_property ("name", str) && _name == str || ignore_name) {
+                       if ((*niter)->get_property ("name", str) && (_name == str || ignore_name)) {
                                if ((*niter)->get_property ("direction", str) && str == instr) {
                                        io_node = (*niter);
                                        break;
@@ -188,7 +188,7 @@ IOProcessor::set_state (const XMLNode& node, int version)
        if (_own_output && _output) {
                for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
                        if ((*niter)->name() == "IO") {
-                               if ((*niter)->get_property ("name", str) && _name == str || ignore_name) {
+                               if ((*niter)->get_property ("name", str) && (_name == str || ignore_name)) {
                                        if ((*niter)->get_property ("direction", str) && str == outstr) {
                                                io_node = (*niter);
                                                break;
@@ -223,21 +223,13 @@ IOProcessor::set_state_2X (const XMLNode& node, int version)
 }
 
 void
-IOProcessor::silence (framecnt_t nframes, framepos_t /* start_frame */)
+IOProcessor::silence (samplecnt_t nframes, samplepos_t /* start_sample */)
 {
        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
 {