X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fdelivery.cc;h=9eaf843f7c359d2f642c0194ffe3621580c9d930;hb=07112b55e0bb7ceb9e5c05ab4df167ecaf7edd9b;hp=3d808563de3a8782491cac47ae3684ce93ca9e8c;hpb=7bdcc127e3e42bd76b997b56ecd938b1127d790b;p=ardour.git

diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index 3d808563de..9eaf843f7c 100644
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -22,33 +22,27 @@
 #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/audioengine.h"
 #include "ardour/buffer_set.h"
-#include "ardour/configuration.h"
+#include "ardour/debug.h"
+#include "ardour/delivery.h"
 #include "ardour/io.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/panner_shell.h"
 #include "ardour/port.h"
 #include "ardour/session.h"
-#include "ardour/audioengine.h"
 
 #include "i18n.h"
 
+namespace ARDOUR { class Panner; }
+
 using namespace std;
 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 */
@@ -61,8 +55,7 @@ Delivery::Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<Pann
 	, _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));
@@ -73,21 +66,18 @@ Delivery::Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<Pann
 	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 */
 
 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())
 	, _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));
@@ -98,14 +88,21 @@ Delivery::Delivery (Session& s, boost::shared_ptr<Pannable> pannable, boost::sha
 	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;
 }
 
@@ -126,12 +123,6 @@ Delivery::display_name () const
 	}
 }
 
-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
 {
@@ -188,7 +179,10 @@ Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out) con
 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
@@ -389,7 +383,7 @@ void
 Delivery::reset_panner ()
 {
 	if (panners_legal) {
-		if (!no_panner_reset) {
+		if (!_no_panner_reset) {
 
 			if (_panshell) {
 				_panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, pan_outs()));
@@ -406,7 +400,7 @@ Delivery::reset_panner ()
 	}
 }
 
-int
+void
 Delivery::panners_became_legal ()
 {
 	if (_panshell) {
@@ -418,39 +412,38 @@ Delivery::panners_became_legal ()
 	}
 
 	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 */
 
@@ -461,7 +454,7 @@ Delivery::flush_buffers (framecnt_t nframes, framepos_t time)
 	PortSet& ports (_output->ports());
 
 	for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
-		i->flush_buffers (nframes, time);
+		i->flush_buffers (nframes);
 	}
 }