X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fauditioner.cc;h=75a40f142db7a7bd30292ef7302662ff671b9245;hb=c0e6f8e4c324c3f44613949b59acd9e864ab263d;hp=9db604cd5480d4b22dc630a3f449b6c8885755e7;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 9db604cd54..75a40f142d 100644
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "pbd/error.h"
 
@@ -29,7 +29,7 @@
 #include "ardour/session.h"
 #include "ardour/auditioner.h"
 #include "ardour/audioplaylist.h"
-#include "ardour/panner.h"
+#include "ardour/audio_port.h"
 #include "ardour/data_type.h"
 #include "ardour/region_factory.h"
 
@@ -40,46 +40,113 @@ using namespace PBD;
 #include "i18n.h"
 
 Auditioner::Auditioner (Session& s)
-	: AudioTrack (s, "auditioner", Route::Hidden)
+	: AudioTrack (s, "auditioner", Route::Auditioner)
+        , current_frame (0)
+        , _auditioning (0)
+        , length (0)
+        , _seek_frame (-1)
+        , _seeking (false)
+        , _seek_complete (false)
+        , via_monitor (false)
 {
-	string left = _session.config.get_auditioner_output_left();
-	string right = _session.config.get_auditioner_output_right();
+}
 
-	if (left == "default") {
-		left = _session.engine().get_nth_physical_output (DataType::AUDIO, 0);
+int
+Auditioner::init ()
+{
+        if (Track::init ()) {
+                return -1;
+        }
+	
+	if (connect ()) {
+		return -1;
 	}
 
-	if (right == "default") {
-		right = _session.engine().get_nth_physical_output (DataType::AUDIO, 1);
-	}
+	_output->changed.connect_same_thread (*this, boost::bind (&Auditioner::output_changed, this, _1, _2));
 
-	if ((left.length() == 0) && (right.length() == 0)) {
-		warning << _("no outputs available for auditioner - manual connection required") << endmsg;
-		return;
-	}
+        return 0;
+}
+
+Auditioner::~Auditioner ()
+{
+}
+
+int
+Auditioner::connect ()
+{
+	string left = Config->get_auditioner_output_left();
+	string right = Config->get_auditioner_output_right();
 
-	_main_outs->defer_pan_reset ();
+	vector<string> outputs;
+	_session.engine().get_physical_outputs (DataType::AUDIO, outputs);
 
-	if (left.length()) {
-		_output->add_port (left, this, DataType::AUDIO);
+	via_monitor = false;
+
+	if (left.empty() || left == "default") {
+                if (_session.monitor_out()) {
+                        left = _session.monitor_out()->input()->audio (0)->name();
+                        via_monitor = true;
+                } else {
+			if (outputs.size() > 0) {
+				left = outputs[0];
+			}
+                }
 	}
 
-	if (right.length()) {
-		audio_diskstream()->add_channel (1);
-		_output->add_port (right, this, DataType::AUDIO);
+	if (right.empty() || right == "default") {
+                if (_session.monitor_out()) {
+                        right = _session.monitor_out()->input()->audio (1)->name();
+                        via_monitor = true;
+                } else {
+			if (outputs.size() > 1) {
+				right = outputs[1];
+			}
+                }
 	}
 
-	_main_outs->allow_pan_reset ();
-	_main_outs->reset_panner ();
+	_output->disconnect (this);
+
+	if (left.empty() && right.empty()) {
+		if (_output->n_ports().n_audio() == 0) {
+			/* ports not set up, so must be during startup */
+			warning << _("no outputs available for auditioner - manual connection required") << endmsg;
+		}
+	} else {
 
-	_output->changed.connect (mem_fun (*this, &Auditioner::output_changed));
+		if (_output->n_ports().n_audio() == 0) {
 
-	the_region.reset ((AudioRegion*) 0);
-	g_atomic_int_set (&_active, 0);
-}
+			/* create (and connect) new ports */
 
-Auditioner::~Auditioner ()
-{
+			_main_outs->defer_pan_reset ();
+			
+			if (left.length()) {
+				_output->add_port (left, this, DataType::AUDIO);
+			}
+			
+			if (right.length()) {
+				_output->add_port (right, this, DataType::AUDIO);
+			}
+			
+			_main_outs->allow_pan_reset ();
+			_main_outs->reset_panner ();
+
+		} else {
+			
+			/* reconnect existing ports */
+
+			boost::shared_ptr<Port> oleft (_output->nth (0));
+			boost::shared_ptr<Port> oright (_output->nth (1));
+			if (oleft) {
+				oleft->connect (left);
+			}
+			if (oright) {
+				oright->connect (right);
+			}
+		}
+			
+	}
+
+	return 0;
 }
 
 AudioPlaylist&
@@ -93,32 +160,10 @@ Auditioner::prepare_playlist ()
 	return *apl;
 }
 
-void
-Auditioner::audition_current_playlist ()
-{
-	if (g_atomic_int_get (&_active)) {
-		/* don't go via session for this, because we are going
-		   to remain active.
-		*/
-		cancel_audition ();
-	}
-
-	Glib::Mutex::Lock lm (lock);
-	_diskstream->seek (0);
-	length = _diskstream->playlist()->get_maximum_extent();
-	current_frame = 0;
-
-	/* force a panner reset now that we have all channels */
-
-	_main_outs->panner()->reset (n_outputs().n_audio(), _diskstream->n_channels().n_audio());
-
-	g_atomic_int_set (&_active, 1);
-}
-
 void
 Auditioner::audition_region (boost::shared_ptr<Region> region)
 {
-	if (g_atomic_int_get (&_active)) {
+	if (g_atomic_int_get (&_auditioning)) {
 		/* don't go via session for this, because we are going
 		   to remain active.
 		*/
@@ -130,12 +175,12 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
 		return;
 	}
 
-	Glib::Mutex::Lock lm (lock);
+	Glib::Threads::Mutex::Lock lm (lock);
 
 	/* copy it */
 
 	boost::shared_ptr<AudioRegion> the_region (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region)));
-	the_region->set_position (0, this);
+	the_region->set_position (0);
 
 	_diskstream->playlist()->drop_regions ();
 	_diskstream->playlist()->add_region (the_region, 0, 1);
@@ -146,14 +191,27 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
 		audio_diskstream()->remove_channel (_diskstream->n_channels().n_audio() - the_region->n_channels());
 	}
 
+        ProcessorStreams ps;
+	{
+		Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+
+		if (configure_processors (&ps)) {
+			error << string_compose (_("Cannot setup auditioner processing flow for %1 channels"),
+						 _diskstream->n_channels()) << endmsg;
+			return;
+		}
+	}
+
 	/* force a panner reset now that we have all channels */
 
 	_main_outs->reset_panner();
 
+	_seek_frame = -1;
+	_seeking = false;
 	length = the_region->length();
 
 	int dir;
-	nframes_t offset = the_region->sync_offset (dir);
+	framecnt_t offset = the_region->sync_offset (dir);
 
 	/* can't audition from a negative sync point */
 
@@ -164,32 +222,59 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
 	_diskstream->seek (offset);
 	current_frame = offset;
 
-	g_atomic_int_set (&_active, 1);
+	g_atomic_int_set (&_auditioning, 1);
 }
 
 int
-Auditioner::play_audition (nframes_t nframes)
+Auditioner::play_audition (framecnt_t nframes)
 {
-	bool need_butler;
-	nframes_t this_nframes;
+	bool need_butler = false;
+	framecnt_t this_nframes;
 	int ret;
 
-	if (g_atomic_int_get (&_active) == 0) {
+	if (g_atomic_int_get (&_auditioning) == 0) {
 		silence (nframes);
 		return 0;
 	}
 
-	this_nframes = min (nframes, length - current_frame);
+#if 0 // TODO
+	if (_seeking && _seek_complete) {
+		// set FADE-IN
+	} else if (_seek_frame >= 0 && _seek_frame < length && !_seeking) {
+		// set FADE-OUT -- use/override amp? || use region-gain ?
+	}
+#endif
+
+	if (_seeking && _seek_complete) {
+		_seek_complete = false;
+		_seeking = false;
+		_seek_frame = -1;
+	}
+
+	if(!_seeking) {
+		/* process audio */
+		this_nframes = min (nframes, length - current_frame);
+
+		if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, need_butler)) != 0) {
+			silence (nframes);
+			return ret;
+		}
 
-	_diskstream->prepare ();
+		current_frame += this_nframes;
 
-	if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, false, false)) != 0) {
+	} else {
 		silence (nframes);
-		return ret;
 	}
 
-	need_butler = _diskstream->commit (this_nframes);
-	current_frame += this_nframes;
+	if (_seek_frame >= 0 && _seek_frame < length && !_seeking) {
+		_seek_complete = false;
+		_seeking = true;
+		need_butler = true;
+	}
+
+	if (!_seeking) {
+		AuditionProgress(current_frame, length); /* emit */
+	}
 
 	if (current_frame >= length) {
 		_session.cancel_audition ();
@@ -202,32 +287,57 @@ Auditioner::play_audition (nframes_t nframes)
 void
 Auditioner::output_changed (IOChange change, void* /*src*/)
 {
-	string phys;
-
-	if (change & ConnectionsChanged) {
+	if (change.type & IOChange::ConnectionsChanged) {
+		string phys;
 		vector<string> connections;
+		vector<string> outputs;
+		_session.engine().get_physical_outputs (DataType::AUDIO, outputs);
 		if (_output->nth (0)->get_connections (connections)) {
-			phys = _session.engine().get_nth_physical_output (DataType::AUDIO, 0);
+			if (outputs.size() > 0) {
+				phys = outputs[0];
+			}
 			if (phys != connections[0]) {
-				_session.config.set_auditioner_output_left (connections[0]);
+				Config->set_auditioner_output_left (connections[0]);
 			} else {
-				_session.config.set_auditioner_output_left ("default");
+				Config->set_auditioner_output_left ("default");
 			}
 		} else {
-			_session.config.set_auditioner_output_left ("");
+			Config->set_auditioner_output_left ("");
 		}
 
 		connections.clear ();
 
 		if (_output->nth (1)->get_connections (connections)) {
-			phys = _session.engine().get_nth_physical_output (DataType::AUDIO, 1);
+			if (outputs.size() > 1) {
+				phys = outputs[1];
+			}
 			if (phys != connections[0]) {
-				_session.config.set_auditioner_output_right (connections[0]);
+				Config->set_auditioner_output_right (connections[0]);
 			} else {
-				_session.config.set_auditioner_output_right ("default");
+				Config->set_auditioner_output_right ("default");
 			}
 		} else {
-			_session.config.set_auditioner_output_right ("");
+			Config->set_auditioner_output_right ("");
 		}
 	}
 }
+
+ChanCount
+Auditioner::input_streams () const
+{
+        /* auditioner never has any inputs - its channel configuration
+           depends solely on the region we are auditioning.
+        */
+
+        if (audio_diskstream()) {
+                return audio_diskstream()->n_channels();
+        }
+
+        return ChanCount ();
+}
+
+MonitorState 
+Auditioner::monitoring_state () const
+{
+	return MonitoringDisk;
+}