clean up debugging

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

diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc
index fdc2b259e1342fc64bf273626f7eb98934a69a96..e64db79c869770e7c4d34e602fcf120dcce44ae9 100644 (file)
--- a/libs/ardour/return.cc
+++ b/libs/ardour/return.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 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
@@ -21,39 +21,36 @@
 
 #include "pbd/xml++.h"
 
-#include "ardour/return.h"
-#include "ardour/session.h"
-#include "ardour/port.h"
+#include "ardour/amp.h"
 #include "ardour/audio_port.h"
 #include "ardour/buffer_set.h"
+#include "ardour/io.h"
 #include "ardour/meter.h"
 #include "ardour/panner.h"
-#include "ardour/io.h"
+#include "ardour/port.h"
+#include "ardour/return.h"
+#include "ardour/session.h"
+#include "ardour/mute_master.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
 
-Return::Return (Session& s)
-       : IOProcessor (s, string_compose (_("return %1"), (_bitslot = s.next_return_id()) + 1))
-{
-       ProcessorCreated (this); /* EMIT SIGNAL */
-}
-
-Return::Return (Session& s, const XMLNode& node)
-       : IOProcessor (s, "return")
+Return::Return (Session& s, bool internal)
+       : IOProcessor (s, (internal ? false : true), false,
+                      string_compose (_("return %1"), (_bitslot = s.next_return_id()) + 1))
+       , _metering (false)
 {
-       if (set_state (node)) {
-               throw failed_constructor();
-       }
+       /* never muted */
 
-       ProcessorCreated (this); /* EMIT SIGNAL */
+       _amp.reset (new Amp (_session));
+       _meter.reset (new PeakMeter (_session));
 }
 
 Return::~Return ()
 {
-       GoingAway ();
+        _session.unmark_return_id (_bitslot);
 }
 
 XMLNode&
@@ -75,19 +72,11 @@ Return::state(bool full)
 }
 
 int
-Return::set_state(const XMLNode& node)
+Return::set_state (const XMLNode& node, int version)
 {
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
        const XMLProperty* prop;
-
-       if ((prop = node.property ("bitslot")) == 0) {
-               _bitslot = _session.next_return_id();
-       } else {
-               sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
-               _session.mark_return_id (_bitslot);
-       }
-
        const XMLNode* insert_node = &node;
 
        /* Return has regular IO automation (gain, pan) */
@@ -99,32 +88,57 @@ Return::set_state(const XMLNode& node)
                        // _io->set_automation_state (*(*niter), Evoral::Parameter(GainAutomation));
                }
        }
-       
-       IOProcessor::set_state (*insert_node);
 
+       IOProcessor::set_state (*insert_node, version);
+
+       if ((prop = node.property ("bitslot")) == 0) {
+               _bitslot = _session.next_return_id();
+       } else {
+                _session.unmark_return_id (_bitslot);
+               sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+               _session.mark_return_id (_bitslot);
+       }
+        
        return 0;
 }
 
 void
-Return::run_in_place (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes)
+Return::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool)
 {
-       if (active()) {
-               _io->collect_input (bufs, nframes, _configured_input);
-               bufs.set_count(_configured_output);
+       if ((!_active && !_pending_active) || _input->n_ports() == ChanCount::ZERO) {
+               return;
        }
+
+       _input->collect_input (bufs, nframes, _configured_input);
+       bufs.set_count(_configured_output);
+
+       // Can't automate gain for sends or returns yet because we need different buffers
+       // so that we don't overwrite the main automation data for the route amp
+       // _amp->setup_gain_automation (start_frame, end_frame, nframes);
+       _amp->run (bufs, start_frame, end_frame, nframes, true);
+
+       if (_metering) {
+               if (_amp->gain_control()->get_value() == 0) {
+                       _meter->reset();
+               } else {
+                       _meter->run (bufs, start_frame, end_frame, nframes, true);
+               }
+       }
+
+       _active = _pending_active;
 }
 
 bool
 Return::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
 {
-       out = in + _io->n_inputs();
+       out = in + _input->n_ports();
        return true;
 }
 
 bool
 Return::configure_io (ChanCount in, ChanCount out)
 {
-       if (out != in + _io->n_inputs()) {
+       if (out != in + _input->n_ports()) {
                return false;
        }
 
@@ -153,7 +167,7 @@ Return::make_unique (XMLNode &state, Session &session)
        state.property("bitslot")->set_value (buf);
 
        std::string const name = string_compose (_("return %1"), bitslot);
-       
+
        state.property("name")->set_value (name);
 
        XMLNode* io = state.child ("IO");
@@ -162,3 +176,4 @@ Return::make_unique (XMLNode &state, Session &session)
        }
 }
 
+