add left/right side trim cursors and use them for region trimming, as appropriate

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

diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc
index 39acf0ddf103ebe716e95b993d43070380c03e29..10879d772206cb61172b1ae584f924b7e25cee33 100644 (file)
--- a/libs/ardour/return.cc
+++ b/libs/ardour/return.cc
@@ -30,6 +30,7 @@
 #include "ardour/port.h"
 #include "ardour/return.h"
 #include "ardour/session.h"
+#include "ardour/mute_master.h"
 
 #include "i18n.h"
 
@@ -43,14 +44,13 @@ Return::Return (Session& s, bool internal)
 {
        /* never muted */
 
-       _amp.reset (new Amp (_session, boost::shared_ptr<MuteMaster>()));
+       _amp.reset (new Amp (_session));
        _meter.reset (new PeakMeter (_session));
-
-       ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 Return::~Return ()
 {
+        _session.unmark_return_id (_bitslot);
 }
 
 XMLNode&
@@ -77,14 +77,6 @@ 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,6 +91,14 @@ Return::set_state (const XMLNode& node, int version)
 
        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;
 }