Move is_embedded calculation to a single place.

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

diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc
index 858d658c9c2b07e43d6a5b0738e854031619058b..82d1cf6ff2dea83765289799a9292d44c7cad0cb 100644 (file)
--- a/libs/ardour/return.cc
+++ b/libs/ardour/return.cc
@@ -58,7 +58,7 @@ Return::Return (Session& s, const XMLNode& node, bool internal)
        _amp.reset (new Amp (_session, boost::shared_ptr<MuteMaster>()));
        _meter.reset (new PeakMeter (_session));
 
-       if (set_state (node)) {
+       if (set_state (node, Stateful::loading_state_version)) {
                throw failed_constructor();
        }
 
@@ -89,7 +89,7 @@ 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;
@@ -114,13 +114,13 @@ Return::set_state(const XMLNode& node)
                }
        }
 
-       IOProcessor::set_state (*insert_node);
+       IOProcessor::set_state (*insert_node, version);
 
        return 0;
 }
 
 void
-Return::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
+Return::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool)
 {
        if ((!_active && !_pending_active) || _input->n_ports() == ChanCount::ZERO) {
                return;
@@ -132,13 +132,13 @@ Return::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframe
        // 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);
+       _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);
+                       _meter->run (bufs, start_frame, end_frame, nframes, true);
                }
        }