X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fauditioner.cc;h=baf97292ec96a34dc50f0eb23180e8e0060a9d69;hb=a017411dfab6d85fdbdcb9d4fd17a05f0ee2cc2a;hp=29ae3b4d2bc109d042ff3d0de67ce60d2c58dea2;hpb=82232f06ba3eea4a2b4342ad91fab552f4044402;p=ardour.git

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 29ae3b4d2b..baf97292ec 100644
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001 Paul Davis 
+    Copyright (C) 2001 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,22 +15,24 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <glibmm/thread.h>
 
-#include <pbd/error.h>
-
-#include <ardour/audio_diskstream.h>
-#include <ardour/audioregion.h>
-#include <ardour/route.h>
-#include <ardour/session.h>
-#include <ardour/auditioner.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/panner.h>
-#include <ardour/data_type.h>
-#include <ardour/region_factory.h>
+#include "pbd/error.h"
+
+#include "ardour/audio_diskstream.h"
+#include "ardour/audioregion.h"
+#include "ardour/audioengine.h"
+#include "ardour/delivery.h"
+#include "ardour/route.h"
+#include "ardour/session.h"
+#include "ardour/auditioner.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audio_port.h"
+#include "ardour/panner.h"
+#include "ardour/data_type.h"
+#include "ardour/region_factory.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -40,33 +42,69 @@ using namespace PBD;
 
 Auditioner::Auditioner (Session& s)
 	: AudioTrack (s, "auditioner", Route::Hidden)
+        , current_frame (0)
+        , _auditioning (0)
+        , length (0)
+        , via_monitor (false)
+{
+}
+
+int
+Auditioner::init ()
 {
-	string left = Config->get_auditioner_output_left();
-	string right = Config->get_auditioner_output_right();
-	
+        if (Track::init ()) {
+                return -1;
+        }
+
+	string left = _session.config.get_auditioner_output_left();
+	string right = _session.config.get_auditioner_output_right();
+
+	vector<string> outputs;
+	_session.engine().get_physical_outputs (DataType::AUDIO, outputs);
+
+	if (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 == "default") {
+                if (_session.monitor_out()) {
+                        right = _session.monitor_out()->input()->audio (1)->name();
+                        via_monitor = true;
+                } else {
+			if (outputs.size() > 1) {
+				right = outputs[1];
+			}
+                }
+	}
+
 	if ((left.length() == 0) && (right.length() == 0)) {
-		return;
+		warning << _("no outputs available for auditioner - manual connection required") << endmsg;
+		return -1;
 	}
 
-	defer_pan_reset ();
+	_main_outs->defer_pan_reset ();
 
 	if (left.length()) {
-		add_output_port (left, this, DataType::AUDIO);
+		_output->add_port (left, this, DataType::AUDIO);
 	}
 
 	if (right.length()) {
-		audio_diskstream()->add_channel();
-		add_output_port (right, this, DataType::AUDIO);
+		_output->add_port (right, this, DataType::AUDIO);
 	}
 
-	allow_pan_reset ();
-	
-	reset_panner ();
+	_main_outs->allow_pan_reset ();
+	_main_outs->reset_panner ();
 
-	IO::output_changed.connect (mem_fun (*this, &Auditioner::output_changed));
+	_output->changed.connect_same_thread (*this, boost::bind (&Auditioner::output_changed, this, _1, _2));
 
-	the_region.reset ((AudioRegion*) 0);
-	g_atomic_int_set (&_active, 0);
+        return 0;
 }
 
 Auditioner::~Auditioner ()
@@ -77,17 +115,17 @@ AudioPlaylist&
 Auditioner::prepare_playlist ()
 {
 	// FIXME auditioner is still audio-only
-	AudioPlaylist* const apl = dynamic_cast<AudioPlaylist*>(_diskstream->playlist());
+	boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist>(_diskstream->playlist());
 	assert(apl);
 
-	apl->clear (false);
+	apl->clear ();
 	return *apl;
 }
 
 void
 Auditioner::audition_current_playlist ()
 {
-	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.
 		*/
@@ -96,20 +134,20 @@ Auditioner::audition_current_playlist ()
 
 	Glib::Mutex::Lock lm (lock);
 	_diskstream->seek (0);
-	length = _diskstream->playlist()->get_maximum_extent();
+	length = _diskstream->playlist()->get_extent().second;
 	current_frame = 0;
 
 	/* force a panner reset now that we have all channels */
 
-	_panner->reset (n_outputs().get(DataType::AUDIO), _diskstream->n_channels().get(DataType::AUDIO));
+	_main_outs->panner()->reset (n_outputs().n_audio(), _diskstream->n_channels().n_audio());
 
-	g_atomic_int_set (&_active, 1);
+	g_atomic_int_set (&_auditioning, 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.
 		*/
@@ -128,49 +166,62 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
 	boost::shared_ptr<AudioRegion> the_region (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region)));
 	the_region->set_position (0, this);
 
-	_diskstream->playlist()->clear (false);
-	_diskstream->playlist()->add_region (the_region, 0, 1, false);
+	_diskstream->playlist()->drop_regions ();
+	_diskstream->playlist()->add_region (the_region, 0, 1);
 
-	while (_diskstream->n_channels().get(DataType::AUDIO) < the_region->n_channels()) {
-		audio_diskstream()->add_channel ();
+	if (_diskstream->n_channels().n_audio() < the_region->n_channels()) {
+		audio_diskstream()->add_channel (the_region->n_channels() - _diskstream->n_channels().n_audio());
+	} else if (_diskstream->n_channels().n_audio() > the_region->n_channels()) {
+		audio_diskstream()->remove_channel (_diskstream->n_channels().n_audio() - the_region->n_channels());
 	}
 
-	while (_diskstream->n_channels().get(DataType::AUDIO) > the_region->n_channels()) {
-		audio_diskstream()->remove_channel ();
-	}
+        ProcessorStreams ps;
+        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 */
 
-	reset_panner();
+	_main_outs->reset_panner();
 
 	length = the_region->length();
-	_diskstream->seek (0);
-	current_frame = 0;
-	g_atomic_int_set (&_active, 1);
+
+	int dir;
+	nframes_t offset = the_region->sync_offset (dir);
+
+	/* can't audition from a negative sync point */
+
+	if (dir < 0) {
+		offset = 0;
+	}
+
+	_diskstream->seek (offset);
+	current_frame = offset;
+
+	g_atomic_int_set (&_auditioning, 1);
 }
 
 int
-Auditioner::play_audition (jack_nframes_t nframes)
+Auditioner::play_audition (nframes_t nframes)
 {
-	bool need_butler;
-	jack_nframes_t this_nframes;
+	bool need_butler = false;
+	nframes_t this_nframes;
 	int ret;
 
-	if (g_atomic_int_get (&_active) == 0) {
-		silence (nframes, 0);
+	if (g_atomic_int_get (&_auditioning) == 0) {
+		silence (nframes);
 		return 0;
 	}
 
 	this_nframes = min (nframes, length - current_frame);
 
-	_diskstream->prepare ();
-
-	if ((ret = roll (this_nframes, current_frame, current_frame + nframes, 0, false, false, false)) != 0) {
-		silence (nframes, 0);
+	if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, false, false, need_butler)) != 0) {
+		silence (nframes);
 		return ret;
 	}
 
-	need_butler = _diskstream->commit (this_nframes);
 	current_frame += this_nframes;
 
 	if (current_frame >= length) {
@@ -182,20 +233,39 @@ Auditioner::play_audition (jack_nframes_t nframes)
 }
 
 void
-Auditioner::output_changed (IOChange change, void* src)
+Auditioner::output_changed (IOChange change, void* /*src*/)
 {
-	if (change & ConnectionsChanged) {
-		const char ** connections;
-		connections =  output (0)->get_connections ();
-		if (connections) {
-			Config->set_auditioner_output_left (connections[0]);
-			free (connections);
+	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)) {
+			if (outputs.size() > 0) {
+				phys = outputs[0];
+			}
+			if (phys != connections[0]) {
+				_session.config.set_auditioner_output_left (connections[0]);
+			} else {
+				_session.config.set_auditioner_output_left ("default");
+			}
+		} else {
+			_session.config.set_auditioner_output_left ("");
 		}
-		
-		connections = output (1)->get_connections ();
-		if (connections) {
-			Config->set_auditioner_output_right (connections[0]);
-			free (connections);
+
+		connections.clear ();
+
+		if (_output->nth (1)->get_connections (connections)) {
+			if (outputs.size() > 1) {
+				phys = outputs[1];
+			}
+			if (phys != connections[0]) {
+				_session.config.set_auditioner_output_right (connections[0]);
+			} else {
+				_session.config.set_auditioner_output_right ("default");
+			}
+		} else {
+			_session.config.set_auditioner_output_right ("");
 		}
 	}
 }