using namespace PBD;
using namespace ARDOUR;
-PBD::Signal1<void, pframes_t> Delivery::CycleStart;
-PBD::Signal0<int> Delivery::PannersLegal;
+PBD::Signal0<void> Delivery::PannersLegal;
bool Delivery::panners_legal = false;
/* deliver to an existing IO object */
, _current_gain (1.0)
, _no_outs_cuz_we_no_monitor (false)
, _mute_master (mm)
- , no_panner_reset (false)
- , scnt (0)
+ , _no_panner_reset (false)
{
if (pannable) {
_panshell = boost::shared_ptr<PannerShell>(new PannerShell (_name, _session, pannable));
if (_output) {
_output->changed.connect_same_thread (*this, boost::bind (&Delivery::output_changed, this, _1, _2));
}
-
- CycleStart.connect_same_thread (*this, boost::bind (&Delivery::cycle_start, this, _1));
}
/* deliver to a new IO object */
, _current_gain (1.0)
, _no_outs_cuz_we_no_monitor (false)
, _mute_master (mm)
- , no_panner_reset (false)
- , scnt (0)
+ , _no_panner_reset (false)
{
if (pannable) {
_panshell = boost::shared_ptr<PannerShell>(new PannerShell (_name, _session, pannable));
if (_output) {
_output->changed.connect_same_thread (*this, boost::bind (&Delivery::output_changed, this, _1, _2));
}
-
- CycleStart.connect_same_thread (*this, boost::bind (&Delivery::cycle_start, this, _1));
}
Delivery::~Delivery()
{
- DEBUG_TRACE (DEBUG::Destruction, string_compose ("delivery %1 destructor\n", _name));
+ DEBUG_TRACE (DEBUG::Destruction, string_compose ("delivery %1 destructor\n", _name));
+
+ /* this object should vanish from any signal callback lists
+ that it is on before we get any further. The full qualification
+ of the method name is not necessary, but is here to make it
+ clear that this call is about signals, not data flow connections.
+ */
+
+ ScopedConnectionList::drop_connections ();
+
delete _output_buffers;
}
}
}
-void
-Delivery::cycle_start (pframes_t /*nframes*/)
-{
- _no_outs_cuz_we_no_monitor = false;
-}
-
bool
Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
{
void
Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool result_required)
{
- boost::shared_ptr<Panner> panner;
-
assert (_output);
PortSet& ports (_output->ports());
_output->silence (nframes);
if (result_required) {
+ bufs.set_count (output_buffers().count ());
Amp::apply_simple_gain (bufs, nframes, 0.0);
}
goto out;
Amp::apply_simple_gain (bufs, nframes, tgain);
}
- if (_panshell) {
- panner = _panshell->panner();
- }
-
-#if 0
- if (_session.transport_rolling()) {
- cerr << name() << " first value written : " << scnt << endl;
- for (BufferSet::audio_iterator b = bufs.audio_begin(); b != bufs.audio_end(); ++b) {
- Sample* p = b->data ();
- float s = (float) scnt;
- for (pframes_t n = 0; n < nframes; ++n) {
- p[n] = s * 0.001;
- s += 1.0;
- }
- }
- scnt += nframes;
- }
-#endif
-
- if (panner && !panner->bypassed()) {
+ if (_panshell && !_panshell->bypassed() && _panshell->panner()) {
// Use the panner to distribute audio to output port buffers
_panshell->run (bufs, output_buffers(), start_frame, end_frame, nframes);
+ // MIDI 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, 0);
+ }
} else {
node.add_property("role", enum_2_string(_role));
if (_panshell) {
- node.add_child_nocopy (_panshell->state (full_state));
+ node.add_child_nocopy (_panshell->get_state ());
}
return node;
// std::cerr << this << ' ' << _name << " NO ROLE INFO\n";
}
- XMLNode* pan_node = node.child (X_("Panner"));
+ XMLNode* pan_node = node.child (X_("PannerShell"));
if (pan_node && _panshell) {
_panshell->set_state (*pan_node, version);
_panshell.reset ();
}
+uint32_t
+Delivery::pan_outs () const
+{
+ if (_output) {
+ return _output->n_ports().n_audio();
+ }
+
+ return _configured_output.n_audio();
+}
+
void
Delivery::reset_panner ()
{
if (panners_legal) {
- if (!no_panner_reset) {
-
- uint32_t ntargets;
-
- if (_output) {
- ntargets = _output->n_ports().n_audio();
- } else {
- ntargets = _configured_output.n_audio();
- }
+ if (!_no_panner_reset) {
if (_panshell) {
- _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets));
+ _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, pan_outs()));
if (_role == Main) {
_panshell->pannable()->set_panner (_panshell->panner());
}
}
-int
+void
Delivery::panners_became_legal ()
{
- uint32_t ntargets;
-
- if (_output) {
- ntargets = _output->n_ports().n_audio();
- } else {
- ntargets = _configured_output.n_audio();
- }
-
if (_panshell) {
- _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets));
+ _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, pan_outs()));
if (_role == Main) {
_panshell->pannable()->set_panner (_panshell->panner());
}
panner_legal_c.disconnect ();
- return 0;
}
void
Delivery::defer_pan_reset ()
{
- no_panner_reset = true;
+ _no_panner_reset = true;
}
void
Delivery::allow_pan_reset ()
{
- no_panner_reset = false;
+ _no_panner_reset = false;
reset_panner ();
}
int
-Delivery::disable_panners (void)
+Delivery::disable_panners ()
{
panners_legal = false;
return 0;
}
-int
+void
Delivery::reset_panners ()
{
panners_legal = true;
- return *PannersLegal ();
+ PannersLegal ();
}
void
-Delivery::flush_buffers (framecnt_t nframes, framepos_t time)
+Delivery::flush_buffers (framecnt_t nframes)
{
/* io_lock, not taken: function must be called from Session::process() calltree */
+ if (!_output) {
+ return;
+ }
+
PortSet& ports (_output->ports());
for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
- (*i).flush_buffers (nframes, time);
+ i->flush_buffers (nframes);
}
}
PortSet& ports (_output->ports());
for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
- (*i).transport_stopped ();
+ i->transport_stopped ();
}
}
}
PortSet& ports (_output->ports());
for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
- (*i).realtime_locate ();
+ i->realtime_locate ();
}
}
}
return ret;
}
+bool ignore_output_change = false;
+
void
Delivery::output_changed (IOChange change, void* /*src*/)
{
projects / ardour.git / blobdiff