#include "ardour/midi_buffer.h"
+#include "ardour/debug.h"
#include "ardour/delivery.h"
#include "ardour/audio_buffer.h"
+#include "ardour/audio_port.h"
#include "ardour/amp.h"
#include "ardour/buffer_set.h"
#include "ardour/configuration.h"
#include "ardour/meter.h"
#include "ardour/mute_master.h"
#include "ardour/panner.h"
+#include "ardour/panner_shell.h"
+#include "ardour/pannable.h"
#include "ardour/port.h"
#include "ardour/session.h"
#include "ardour/audioengine.h"
/* deliver to an existing IO object */
-Delivery::Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<MuteMaster> mm, const string& name, Role r)
+Delivery::Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<Pannable> pannable,
+ boost::shared_ptr<MuteMaster> mm, const string& name, Role r)
: IOProcessor(s, boost::shared_ptr<IO>(), (role_requires_output_ports (r) ? io : boost::shared_ptr<IO>()), name)
, _role (r)
, _output_buffers (new BufferSet())
, _current_gain (1.0)
- , _output_offset (0)
, _no_outs_cuz_we_no_monitor (false)
, _mute_master (mm)
, no_panner_reset (false)
+ , scnt (0)
{
- _panner = boost::shared_ptr<Panner>(new Panner (_name, _session));
+ if (pannable) {
+ _panshell = boost::shared_ptr<PannerShell>(new PannerShell (_name, _session, pannable));
+ }
+
_display_to_user = false;
if (_output) {
/* deliver to a new IO object */
-Delivery::Delivery (Session& s, boost::shared_ptr<MuteMaster> mm, const string& name, Role r)
+Delivery::Delivery (Session& s, boost::shared_ptr<Pannable> pannable, boost::shared_ptr<MuteMaster> mm, const string& name, Role r)
: IOProcessor(s, false, (role_requires_output_ports (r) ? true : false), name)
, _role (r)
, _output_buffers (new BufferSet())
, _current_gain (1.0)
- , _output_offset (0)
, _no_outs_cuz_we_no_monitor (false)
, _mute_master (mm)
, no_panner_reset (false)
+ , scnt (0)
{
- _panner = boost::shared_ptr<Panner>(new Panner (_name, _session));
+ if (pannable) {
+ _panshell = boost::shared_ptr<PannerShell>(new PannerShell (_name, _session, pannable));
+ }
+
_display_to_user = false;
if (_output) {
Delivery::~Delivery()
{
+ DEBUG_TRACE (DEBUG::Destruction, string_compose ("delivery %1 destructor\n", _name));
delete _output_buffers;
}
void
Delivery::cycle_start (pframes_t /*nframes*/)
{
- _output_offset = 0;
_no_outs_cuz_we_no_monitor = false;
}
-void
-Delivery::increment_output_offset (framecnt_t n)
-{
- _output_offset += n;
-}
-
bool
Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
{
}
}
-
+
if (!Processor::configure_io (in, out)) {
return false;
}
processing pathway that wants to use this->output_buffers() for some reason.
*/
- output_buffers().get_jack_port_addresses (ports, nframes, _output_offset);
+ output_buffers().get_jack_port_addresses (ports, nframes);
// this Delivery processor is not a derived type, and thus we assume
// we really can modify the buffers passed in (it is almost certainly
_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 (_panner && _panner->npanners() && !_panner->bypassed()) {
+#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 (_panshell && !_panshell->bypassed()) {
// Use the panner to distribute audio to output port buffers
- _panner->run (bufs, output_buffers(), start_frame, end_frame, nframes);
+ _panshell->run (bufs, output_buffers(), start_frame, end_frame, nframes);
- if (result_required) {
- bufs.read_from (output_buffers (), nframes);
- }
} else {
// Do a 1:1 copy of data to output ports
if (bufs.count().n_audio() > 0 && ports.count().n_audio () > 0) {
- _output->copy_to_outputs (bufs, DataType::AUDIO, nframes, _output_offset);
+ _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, _output_offset);
+ _output->copy_to_outputs (bufs, DataType::MIDI, nframes, 0);
}
-
-
}
+ if (result_required) {
+ bufs.read_from (output_buffers (), nframes);
+ }
+
out:
_active = _pending_active;
}
}
node.add_property("role", enum_2_string(_role));
- node.add_child_nocopy (_panner->state (full_state));
+
+ if (_panshell) {
+ 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) {
- _panner->set_state (*pan_node, version);
+ if (pan_node && _panshell) {
+ _panshell->set_state (*pan_node, version);
}
reset_panner ();
return 0;
}
+void
+Delivery::unpan ()
+{
+ /* caller must hold process lock */
+
+ _panshell.reset ();
+}
+
void
Delivery::reset_panner ()
{
ntargets = _configured_output.n_audio();
}
- _panner->reset (ntargets, pans_required());
+ if (_panshell) {
+ _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets));
+
+ if (_role == Main) {
+ _panshell->pannable()->set_panner (_panshell->panner());
+ }
+ }
}
+
} else {
panner_legal_c.disconnect ();
PannersLegal.connect_same_thread (panner_legal_c, boost::bind (&Delivery::panners_became_legal, this));
ntargets = _configured_output.n_audio();
}
- _panner->reset (ntargets, pans_required());
- _panner->load (); // automation
+ if (_panshell) {
+ _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets));
+
+ if (_role == Main) {
+ _panshell->pannable()->set_panner (_panshell->panner());
+ }
+ }
+
panner_legal_c.disconnect ();
return 0;
}
return *PannersLegal ();
}
-
-void
-Delivery::start_pan_touch (uint32_t which, double when)
-{
- if (which < _panner->npanners()) {
- _panner->pan_control(which)->start_touch(when);
- }
-}
-
-void
-Delivery::end_pan_touch (uint32_t which, bool mark, double when)
-{
- if (which < _panner->npanners()) {
- _panner->pan_control(which)->stop_touch(mark, when);
- }
-
-}
-
-
void
Delivery::flush_buffers (framecnt_t nframes, framepos_t time)
{
/* io_lock, not taken: function must be called from Session::process() calltree */
PortSet& ports (_output->ports());
-
+
for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
- (*i).flush_buffers (nframes, time, _output_offset);
+ (*i).flush_buffers (nframes, time);
}
}
{
Processor::transport_stopped (now);
- _panner->transport_stopped (now);
+ if (_panshell) {
+ _panshell->pannable()->transport_stopped (now);
+ }
if (_output) {
PortSet& ports (_output->ports());
-
+
for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
(*i).transport_stopped ();
}
}
}
+void
+Delivery::realtime_locate ()
+{
+ if (_output) {
+ PortSet& ports (_output->ports());
+
+ for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
+ (*i).realtime_locate ();
+ }
+ }
+}
+
gain_t
Delivery::target_gain ()
{
}
MuteMaster::MutePoint mp = MuteMaster::Main; // stupid gcc uninit warning
-
+
switch (_role) {
case Main:
mp = MuteMaster::Main;
}
gain_t desired_gain = _mute_master->mute_gain_at (mp);
-
+
if (_role == Listen && _session.monitor_out() && !_session.listening()) {
-
+
/* 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 = 0.0;
-
- }
+
+ }
return desired_gain;
}
bool ret = IOProcessor::set_name (name);
if (ret) {
- ret = _panner->set_name (name);
+ ret = _panshell->set_name (name);
}
return ret;
_output_buffers->attach_buffers (_output->ports ());
}
}
+
+boost::shared_ptr<Panner>
+Delivery::panner () const
+{
+ if (_panshell) {
+ return _panshell->panner();
+ } else {
+ return boost::shared_ptr<Panner>();
+ }
+}
+
projects / ardour.git / blobdiff