projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add support for plugin bypass/thru connections
[ardour.git]
/
libs
/
ardour
/
delivery.cc
diff --git
a/libs/ardour/delivery.cc
b/libs/ardour/delivery.cc
index 86ce419340acfa781d01691e09378336d779f5b9..b2cdc0b324b30944bfcca4c81b56e5db029ff3a5 100644
(file)
--- a/
libs/ardour/delivery.cc
+++ b/
libs/ardour/delivery.cc
@@
-22,27
+22,22
@@
#include "pbd/enumwriter.h"
#include "pbd/convert.h"
#include "pbd/enumwriter.h"
#include "pbd/convert.h"
-#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/amp.h"
+#include "ardour/audioengine.h"
#include "ardour/buffer_set.h"
#include "ardour/buffer_set.h"
-#include "ardour/configuration.h"
+#include "ardour/debug.h"
+#include "ardour/delivery.h"
#include "ardour/io.h"
#include "ardour/io.h"
-#include "ardour/meter.h"
#include "ardour/mute_master.h"
#include "ardour/mute_master.h"
-#include "ardour/panner.h"
-#include "ardour/panner_shell.h"
#include "ardour/pannable.h"
#include "ardour/pannable.h"
+#include "ardour/panner_shell.h"
#include "ardour/port.h"
#include "ardour/session.h"
#include "ardour/port.h"
#include "ardour/session.h"
-#include "ardour/audioengine.h"
#include "i18n.h"
#include "i18n.h"
+namespace ARDOUR { class Panner; }
+
using namespace std;
using namespace PBD;
using namespace ARDOUR;
using namespace std;
using namespace PBD;
using namespace ARDOUR;
@@
-57,13
+52,15
@@
Delivery::Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<Pann
: IOProcessor(s, boost::shared_ptr<IO>(), (role_requires_output_ports (r) ? io : boost::shared_ptr<IO>()), name)
, _role (r)
, _output_buffers (new BufferSet())
: 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
)
+ , _current_gain (
GAIN_COEFF_UNITY
)
, _no_outs_cuz_we_no_monitor (false)
, _mute_master (mm)
, _no_panner_reset (false)
{
if (pannable) {
, _no_outs_cuz_we_no_monitor (false)
, _mute_master (mm)
, _no_panner_reset (false)
{
if (pannable) {
- _panshell = boost::shared_ptr<PannerShell>(new PannerShell (_name, _session, pannable));
+ bool is_send = false;
+ if (r & (Delivery::Send|Delivery::Aux)) is_send = true;
+ _panshell = boost::shared_ptr<PannerShell>(new PannerShell (_name, _session, pannable, is_send));
}
_display_to_user = false;
}
_display_to_user = false;
@@
-76,16
+73,18
@@
Delivery::Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<Pann
/* deliver to a new IO object */
Delivery::Delivery (Session& s, boost::shared_ptr<Pannable> pannable, boost::shared_ptr<MuteMaster> mm, const string& name, Role r)
/* deliver to a new IO object */
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)
+ : IOProcessor(s, false, (role_requires_output_ports (r) ? true : false), name
, "", DataType::AUDIO, (r == Send)
)
, _role (r)
, _output_buffers (new BufferSet())
, _role (r)
, _output_buffers (new BufferSet())
- , _current_gain (
1.0
)
+ , _current_gain (
GAIN_COEFF_UNITY
)
, _no_outs_cuz_we_no_monitor (false)
, _mute_master (mm)
, _no_panner_reset (false)
{
if (pannable) {
, _no_outs_cuz_we_no_monitor (false)
, _mute_master (mm)
, _no_panner_reset (false)
{
if (pannable) {
- _panshell = boost::shared_ptr<PannerShell>(new PannerShell (_name, _session, pannable));
+ bool is_send = false;
+ if (r & (Delivery::Send|Delivery::Aux)) is_send = true;
+ _panshell = boost::shared_ptr<PannerShell>(new PannerShell (_name, _session, pannable, is_send));
}
_display_to_user = false;
}
_display_to_user = false;
@@
-98,11
+97,11
@@
Delivery::Delivery (Session& s, boost::shared_ptr<Pannable> pannable, boost::sha
Delivery::~Delivery()
{
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
/* 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
+ of the method name is not necessary, but is here to make it
clear that this call is about signals, not data flow connections.
*/
clear that this call is about signals, not data flow connections.
*/
@@
-129,7
+128,7
@@
Delivery::display_name () const
}
bool
}
bool
-Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out)
const
+Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out)
{
if (_role == Main) {
{
if (_role == Main) {
@@
-149,7
+148,7
@@
Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out) con
}
} else {
fatal << "programming error: this should never be reached" << endmsg;
}
} else {
fatal << "programming error: this should never be reached" << endmsg;
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
}
}
@@
-170,7
+169,7
@@
Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out) con
}
} else {
fatal << "programming error: this should never be reached" << endmsg;
}
} else {
fatal << "programming error: this should never be reached" << endmsg;
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
}
} else {
}
} else {
@@
-184,7
+183,10
@@
Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out) con
bool
Delivery::configure_io (ChanCount in, ChanCount out)
{
bool
Delivery::configure_io (ChanCount in, ChanCount out)
{
- assert (!AudioEngine::instance()->process_lock().trylock());
+#ifndef NDEBUG
+ bool r = AudioEngine::instance()->process_lock().trylock();
+ assert (!r && "trylock inside Delivery::configure_io");
+#endif
/* check configuration by comparison with our I/O port configuration, if appropriate.
see ::can_support_io_configuration() for comments
/* check configuration by comparison with our I/O port configuration, if appropriate.
see ::can_support_io_configuration() for comments
@@
-208,7
+210,7
@@
Delivery::configure_io (ChanCount in, ChanCount out)
if (_input->n_ports() != in) {
if (_input->n_ports() != ChanCount::ZERO) {
fatal << _name << " programming error: configure_io called with " << in << " and " << out << " with " << _input->n_ports() << " input ports" << endmsg;
if (_input->n_ports() != in) {
if (_input->n_ports() != ChanCount::ZERO) {
fatal << _name << " programming error: configure_io called with " << in << " and " << out << " with " << _input->n_ports() << " input ports" << endmsg;
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
} else {
/* I/O not yet configured */
}
} else {
/* I/O not yet configured */
}
@@
-247,7
+249,8
@@
Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
processing pathway that wants to use this->output_buffers() for some reason.
*/
processing pathway that wants to use this->output_buffers() for some reason.
*/
- output_buffers().get_jack_port_addresses (ports, nframes);
+ // TODO delayline -- latency-compensation
+ output_buffers().get_backend_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
// this Delivery processor is not a derived type, and thus we assume
// we really can modify the buffers passed in (it is almost certainly
@@
-259,10
+262,9
@@
Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
if (tgain != _current_gain) {
/* target gain has changed */
if (tgain != _current_gain) {
/* target gain has changed */
- Amp::apply_gain (bufs, nframes, _current_gain, tgain);
- _current_gain = tgain;
+ _current_gain = Amp::apply_gain (bufs, _session.nominal_frame_rate(), nframes, _current_gain, tgain);
- } else if (tgain
== 0.0
) {
+ } else if (tgain
< GAIN_COEFF_SMALL
) {
/* we were quiet last time, and we're still supposed to be quiet.
Silence the outputs, and make sure the buffers are quiet too,
/* we were quiet last time, and we're still supposed to be quiet.
Silence the outputs, and make sure the buffers are quiet too,
@@
-271,16
+273,24
@@
Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
_output->silence (nframes);
if (result_required) {
bufs.set_count (output_buffers().count ());
_output->silence (nframes);
if (result_required) {
bufs.set_count (output_buffers().count ());
- Amp::apply_simple_gain (bufs, nframes,
0.0
);
+ Amp::apply_simple_gain (bufs, nframes,
GAIN_COEFF_ZERO
);
}
goto out;
}
goto out;
- } else if (tgain !=
1.0
) {
+ } else if (tgain !=
GAIN_COEFF_UNITY
) {
/* target gain has not changed, but is not unity */
Amp::apply_simple_gain (bufs, nframes, tgain);
}
/* target gain has not changed, but is not unity */
Amp::apply_simple_gain (bufs, nframes, tgain);
}
+ // Speed quietning
+
+ if (fabs (_session.transport_speed()) > 1.5 && Config->get_quieten_at_speed ()) {
+ Amp::apply_simple_gain (bufs, nframes, speed_quietning, false);
+ }
+
+ // Panning
+
if (_panshell && !_panshell->bypassed() && _panshell->panner()) {
// Use the panner to distribute audio to output port buffers
if (_panshell && !_panshell->bypassed() && _panshell->panner()) {
// Use the panner to distribute audio to output port buffers
@@
-290,7
+300,7
@@
Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
// MIDI data will not have been delivered by the panner
if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) {
// 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
);
+ _output->copy_to_outputs (bufs, DataType::MIDI, nframes,
ports.port(0)->port_offset()
);
}
} else {
}
} else {
@@
-302,7
+312,7
@@
Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
}
if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) {
}
if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) {
- _output->copy_to_outputs (bufs, DataType::MIDI, nframes,
0
);
+ _output->copy_to_outputs (bufs, DataType::MIDI, nframes,
ports.port(0)->port_offset()
);
}
}
}
}
@@
-331,6
+341,9
@@
Delivery::state (bool full_state)
if (_panshell) {
node.add_child_nocopy (_panshell->get_state ());
if (_panshell) {
node.add_child_nocopy (_panshell->get_state ());
+ if (_panshell->pannable()) {
+ node.add_child_nocopy (_panshell->pannable()->get_state ());
+ }
}
return node;
}
return node;
@@
-360,6
+373,11
@@
Delivery::set_state (const XMLNode& node, int version)
reset_panner ();
reset_panner ();
+ XMLNode* pannnode = node.child (X_("Pannable"));
+ if (_panshell && _panshell->panner() && pannnode) {
+ _panshell->pannable()->set_state (*pannnode, version);
+ }
+
return 0;
}
return 0;
}
@@
-376,7
+394,7
@@
Delivery::pan_outs () const
{
if (_output) {
return _output->n_ports().n_audio();
{
if (_output) {
return _output->n_ports().n_audio();
- }
+ }
return _configured_output.n_audio();
}
return _configured_output.n_audio();
}
@@
-387,12
+405,8
@@
Delivery::reset_panner ()
if (panners_legal) {
if (!_no_panner_reset) {
if (panners_legal) {
if (!_no_panner_reset) {
- if (_panshell) {
+ if (_panshell
&& _role != Insert && _role != Listen
) {
_panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, pan_outs()));
_panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, pan_outs()));
-
- if (_role == Main) {
- _panshell->pannable()->set_panner (_panshell->panner());
- }
}
}
}
}
@@
-405,12
+419,8
@@
Delivery::reset_panner ()
void
Delivery::panners_became_legal ()
{
void
Delivery::panners_became_legal ()
{
- if (_panshell) {
+ if (_panshell
&& _role != Insert
) {
_panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, pan_outs()));
_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 ();
}
panner_legal_c.disconnect ();
@@
-452,7
+462,7
@@
Delivery::flush_buffers (framecnt_t nframes)
if (!_output) {
return;
}
if (!_output) {
return;
}
-
+
PortSet& ports (_output->ports());
for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
PortSet& ports (_output->ports());
for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
@@
-496,7
+506,7
@@
Delivery::target_gain ()
/* if we've been requested to deactivate, our target gain is zero */
if (!_pending_active) {
/* if we've been requested to deactivate, our target gain is zero */
if (!_pending_active) {
- return
0.0
;
+ return
GAIN_COEFF_ZERO
;
}
/* if we've been told not to output because its a monitoring situation and
}
/* if we've been told not to output because its a monitoring situation and
@@
-504,7
+514,7
@@
Delivery::target_gain ()
*/
if (_no_outs_cuz_we_no_monitor) {
*/
if (_no_outs_cuz_we_no_monitor) {
- return
0.0
;
+ return
GAIN_COEFF_ZERO
;
}
MuteMaster::MutePoint mp = MuteMaster::Main; // stupid gcc uninit warning
}
MuteMaster::MutePoint mp = MuteMaster::Main; // stupid gcc uninit warning
@@
-536,7
+546,7
@@
Delivery::target_gain ()
it gets its signal from the master out.
*/
it gets its signal from the master out.
*/
- desired_gain =
0.0
;
+ desired_gain =
GAIN_COEFF_ZERO
;
}
}
@@
-554,7
+564,7
@@
Delivery::set_name (const std::string& name)
{
bool ret = IOProcessor::set_name (name);
{
bool ret = IOProcessor::set_name (name);
- if (ret) {
+ if (ret
&& _panshell
) {
ret = _panshell->set_name (name);
}
ret = _panshell->set_name (name);
}