#include <algorithm>
#include "pbd/enumwriter.h"
-#include "pbd/convert.h"
+#include "pbd/enum_convert.h"
#include "ardour/amp.h"
#include "ardour/audioengine.h"
#include "ardour/port.h"
#include "ardour/session.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
+
+namespace PBD {
+ DEFINE_ENUM_CONVERT(ARDOUR::Delivery::Role);
+}
namespace ARDOUR { class Panner; }
}
void
-Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool result_required)
+Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double /*speed*/, pframes_t nframes, bool result_required)
{
assert (_output);
_panshell->run (bufs, output_buffers(), start_frame, end_frame, nframes);
- // MIDI data will not have been delivered by the panner
+ // non-audio data will not have been delivered by the panner
- if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) {
- _output->copy_to_outputs (bufs, DataType::MIDI, nframes, ports.port(0)->port_offset());
+ for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+ if (*t != DataType::AUDIO && bufs.count().get(*t) > 0) {
+ _output->copy_to_outputs (bufs, *t, nframes, Port::port_offset());
+ }
}
} else {
- // Do a 1:1 copy of data to output ports
+ /* Do a 1:1 copy of data to output ports
- if (bufs.count().n_audio() > 0 && ports.count().n_audio () > 0) {
+ Audio is handled separately because we use 0 for the offset,
+ since the port offset is only used for timestamped events
+ (i.e. MIDI).
+ */
+
+ if (bufs.count().n_audio() > 0) {
_output->copy_to_outputs (bufs, DataType::AUDIO, nframes, 0);
}
- if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) {
- _output->copy_to_outputs (bufs, DataType::MIDI, nframes, ports.port(0)->port_offset());
+ for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+ if (*t != DataType::AUDIO && bufs.count().get(*t) > 0) {
+ _output->copy_to_outputs (bufs, *t, nframes, Port::port_offset());
+ }
}
}
if (result_required) {
- bufs.read_from (output_buffers (), nframes);
+ /* "bufs" are internal, meaning they should never reflect
+ split-cycle offsets. So shift events back in time from where
+ they were for the external buffers associated with Ports.
+ */
+
+ const BufferSet& outs (output_buffers());
+ bufs.set_count (output_buffers().count ());
+
+ for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+
+ uint32_t n = 0;
+ for (BufferSet::iterator b = bufs.begin (*t); b != bufs.end (*t); ++b) {
+ if (outs.count ().get (*t) <= n) {
+ continue;
+ }
+ b->read_from (outs.get (*t, n++), nframes, (*t == DataType::AUDIO ? 0 : -Port::port_offset()));
+ }
+ }
}
out:
XMLNode& node (IOProcessor::state (full_state));
if (_role & Main) {
- node.add_property("type", "main-outs");
+ node.set_property("type", "main-outs");
} else if (_role & Listen) {
- node.add_property("type", "listen");
+ node.set_property("type", "listen");
} else {
- node.add_property("type", "delivery");
+ node.set_property("type", "delivery");
}
- node.add_property("role", enum_2_string(_role));
+ node.set_property("role", _role);
if (_panshell) {
node.add_child_nocopy (_panshell->get_state ());
int
Delivery::set_state (const XMLNode& node, int version)
{
- XMLProperty const * prop;
-
if (IOProcessor::set_state (node, version)) {
return -1;
}
- if ((prop = node.property ("role")) != 0) {
- _role = Role (string_2_enum (prop->value(), _role));
+ if (node.get_property ("role", _role)) {
// std::cerr << this << ' ' << _name << " set role to " << enum_2_string (_role) << std::endl;
} else {
// std::cerr << this << ' ' << _name << " NO ROLE INFO\n";
}
void
-Delivery::transport_stopped (framepos_t now)
+Delivery::non_realtime_transport_stop (framepos_t now, bool flush)
{
- Processor::transport_stopped (now);
+ Processor::non_realtime_transport_stop (now, flush);
if (_panshell) {
- _panshell->pannable()->transport_stopped (now);
+ _panshell->pannable()->non_realtime_transport_stop (now, flush);
}
- if (_output) {
- PortSet& ports (_output->ports());
+ if (_output) {
+ PortSet& ports (_output->ports());
- for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
- i->transport_stopped ();
- }
- }
+ for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
+ i->transport_stopped ();
+ }
+ }
}
void
Delivery::realtime_locate ()
{
- if (_output) {
- PortSet& ports (_output->ports());
+ if (_output) {
+ PortSet& ports (_output->ports());
- for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
- i->realtime_locate ();
- }
- }
+ for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
+ i->realtime_locate ();
+ }
+ }
}
gain_t
return GAIN_COEFF_ZERO;
}
- MuteMaster::MutePoint mp = MuteMaster::Main; // stupid gcc uninit warning
-
- switch (_role) {
- case Main:
- mp = MuteMaster::Main;
- break;
- case Listen:
- mp = MuteMaster::Listen;
- break;
- case Send:
- case Insert:
- case Aux:
- if (_pre_fader) {
- mp = MuteMaster::PreFader;
- } else {
- mp = MuteMaster::PostFader;
- }
- break;
- }
+ MuteMaster::MutePoint mp = MuteMaster::Main; // stupid gcc uninit warning
- gain_t desired_gain = _mute_master->mute_gain_at (mp);
+ switch (_role) {
+ case Main:
+ mp = MuteMaster::Main;
+ break;
+ case Listen:
+ mp = MuteMaster::Listen;
+ break;
+ case Send:
+ case Insert:
+ case Aux:
+ if (_pre_fader) {
+ mp = MuteMaster::PreFader;
+ } else {
+ mp = MuteMaster::PostFader;
+ }
+ break;
+ }
- if (_role == Listen && _session.monitor_out() && !_session.listening()) {
+ gain_t desired_gain = _mute_master->mute_gain_at (mp);
- /* nobody is soloed, and this delivery is a listen-send to the
- control/monitor/listen bus, we should be silent since
- it gets its signal from the master out.
- */
+ if (_role == Listen && _session.monitor_out() && !_session.listening()) {
- desired_gain = GAIN_COEFF_ZERO;
+ /* nobody is soloed, and this delivery is a listen-send to the
+ * control/monitor/listen bus, we should be silent since
+ * it gets its signal from the master out.
+ */
- }
+ desired_gain = GAIN_COEFF_ZERO;
+ }
return desired_gain;
}
projects / ardour.git / blobdiff