: Delivery (s, mm, string_compose (_("send %1"), (_bitslot = s.next_send_id()) + 1), r)
, _metering (false)
{
- _amp.reset (new Amp (_session, _mute_master));
+ _amp.reset (new Amp (_session));
_meter.reset (new PeakMeter (_session));
-
- ProcessorCreated (this); /* EMIT SIGNAL */
-}
-
-Send::Send (Session& s, boost::shared_ptr<MuteMaster> mm, const XMLNode& node, int version, Role r)
- : Delivery (s, mm, "send", r)
- , _metering (false)
-{
- _amp.reset (new Amp (_session, _mute_master));
- _meter.reset (new PeakMeter (_session));
-
- if (set_state (node, version)) {
- throw failed_constructor();
- }
-
- ProcessorCreated (this); /* EMIT SIGNAL */
}
Send::~Send ()
{
- drop_references ();
+ _session.unmark_send_id (_bitslot);
}
void
}
XMLNode&
-Send::state(bool full)
+Send::state (bool full)
{
XMLNode& node = Delivery::state(full);
char buf[32];
XMLNodeIterator niter;
const XMLProperty* prop;
- if ((prop = node.property ("bitslot")) == 0) {
- _bitslot = _session.next_send_id();
- } else {
- sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
- cerr << this << " scanned " << prop->value() << " to get " << _bitslot << endl;
- _session.mark_send_id (_bitslot);
- }
+ Delivery::set_state (node, version);
- const XMLNode* insert_node = &node;
+ /* don't try to reset bitslot if its already set: this can cause
+ issues with the session's accounting of send ID's
+ */
- /* XXX need to load automation state & data for amp */
+ if ((prop = node.property ("bitslot")) == 0) {
+ _bitslot = _session.next_send_id();
+ } else {
+ _session.unmark_send_id (_bitslot);
+ sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+ _session.mark_send_id (_bitslot);
+ }
- Delivery::set_state (*insert_node, version);
+ /* XXX need to load automation state & data for amp */
return 0;
}
/* we ignore Deliver::_display_to_user */
if (_role == Listen) {
+ /* don't make the monitor/control/listen send visible */
return false;
}