ardour/livetrax
13
0
Fork 0
Code

fix initialization of gain for Listen internal sends (to monitor bus); remove pannable object from monitor bus after (re)creation from XML

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9730 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-06-14 14:49:06 +00:00
parent 39c30e1747
commit a5674e9271
7 changed files with 84 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/delivery.h
View File

@ -95,6 +95,7 @@ public:
boost::shared_ptr<PannerShell> panner_shell() const { return _panshell; }
boost::shared_ptr<Panner> panner() const;
void unpan ();
void reset_panner ();
void defer_pan_reset ();
void allow_pan_reset ();

2
libs/ardour/ardour/internal_send.h
View File

@ -62,7 +62,7 @@ class InternalSend : public Send
void send_to_going_away ();
void send_to_property_changed (const PBD::PropertyChange&);
int connect_when_legal ();
int set_our_state (XMLNode const &, int);
void init_gain ();
int use_target (boost::shared_ptr<Route>);
};

1
libs/ardour/ardour/route.h
View File

@ -526,6 +526,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
framecnt_t update_port_latencies (PortSet& ports, PortSet& feeders, bool playback, framecnt_t) const;
void setup_invisible_processors ();
void unpan ();
boost::shared_ptr<CapturingProcessor> _capturing_processor;

8
libs/ardour/delivery.cc
View File

@ -382,6 +382,14 @@ Delivery::set_state (const XMLNode& node, int version)
return 0;
}
void
Delivery::unpan ()
{
/* caller must hold process lock */
_panshell.reset ();
}
void
Delivery::reset_panner ()
{

16
libs/ardour/internal_return.cc
View File

@ -20,6 +20,7 @@
#include "pbd/failed_constructor.h"
#include "ardour/audio_buffer.h"
#include "ardour/internal_return.h"
#include "ardour/mute_master.h"
#include "ardour/session.h"
@ -52,6 +53,21 @@ InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*e
}
}
#if 0
if (_session.transport_rolling()) {
for (BufferSet::audio_iterator b = bufs.audio_begin(); b != bufs.audio_end(); ++b) {
Sample* p = b->data ();
for (pframes_t n = 0; n < nframes; ++n) {
if (p[n] != 0.0) {
cerr << "\tnon-zero data received\n";
break;
}
}
}
}
#endif
_active = _pending_active;
}

43
libs/ardour/internal_send.cc
View File

@ -21,6 +21,7 @@
#include "pbd/failed_constructor.h"
#include "ardour/amp.h"
#include "ardour/audio_buffer.h"
#include "ardour/internal_send.h"
#include "ardour/meter.h"
#include "ardour/route.h"
@ -41,7 +42,7 @@ InternalSend::InternalSend (Session& s, boost::shared_ptr<Pannable> p, boost::sh
}
}
_amp->set_gain (0, this);
init_gain ();
}
InternalSend::~InternalSend ()
@ -51,6 +52,18 @@ InternalSend::~InternalSend ()
}
}
void
InternalSend::init_gain ()
{
if (_role == Listen) {
/* send to monitor bus is always at unity */
_amp->set_gain (1.0, this);
} else {
/* aux sends start at -inf dB */
_amp->set_gain (0, this);
}
}
int
InternalSend::use_target (boost::shared_ptr<Route> sendto)
{
@ -73,7 +86,6 @@ InternalSend::use_target (boost::shared_ptr<Route> sendto)
return 0;
}
void
InternalSend::send_to_going_away ()
{
@ -140,6 +152,20 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
}
}
#if 0
if (_session.transport_rolling()) {
for (BufferSet::audio_iterator b = mixbufs.audio_begin(); b != mixbufs.audio_end(); ++b) {
Sample* p = b->data ();
for (pframes_t n = 0; n < nframes; ++n) {
if (p[n] != 0.0) {
cerr << "\tnon-zero data SENT to " << b->data() << endl;
break;
}
}
}
}
#endif
/* target will pick up our output when it is ready */
out:
@ -182,10 +208,14 @@ InternalSend::get_state()
}
int
InternalSend::set_our_state (const XMLNode& node, int /*version*/)
InternalSend::set_state (const XMLNode& node, int version)
{
const XMLProperty* prop;
Send::set_state (node, version);
init_gain ();
if ((prop = node.property ("target")) != 0) {
_send_to_id = prop->value();
@ -205,13 +235,6 @@ InternalSend::set_our_state (const XMLNode& node, int /*version*/)
return 0;
}
int
InternalSend::set_state (const XMLNode& node, int version)
{
Send::set_state (node, version);
return set_our_state (node, version);
}
int
InternalSend::connect_when_legal ()
{

24
libs/ardour/route.cc
View File

@ -1901,6 +1901,14 @@ Route::_set_state (const XMLNode& node, int version, bool /*call_base*/)
_mute_master->set_solo_ignore (true);
}
if (is_monitor()) {
/* monitor bus does not get a panner, but if (re)created
via XML, it will already have one by the time we
call ::set_state(). so ... remove it.
*/
unpan ();
}
/* add all processors (except amp, which is always present) */
nlist = node.children();
@ -2372,6 +2380,7 @@ Route::set_processor_state (const XMLNode& node)
if (prop->value() == "intsend") {
processor.reset (new InternalSend (_session, _pannable, _mute_master, boost::shared_ptr<Route>(), Delivery::Role (0)));
} else if (prop->value() == "ladspa" || prop->value() == "Ladspa" ||
prop->value() == "lv2" ||
prop->value() == "vst" ||
@ -3836,3 +3845,18 @@ Route::should_monitor () const
return true;
}
void
Route::unpan ()
{
Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
Glib::RWLock::ReaderLock lp (_processor_lock);
_pannable.reset ();
for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
boost::shared_ptr<Delivery> d = boost::dynamic_pointer_cast<Delivery>(*i);
if (d) {
d->unpan ();
}
}
}