X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fauditioner.cc;h=9f7dd85b52ad24513323712519e65cd33c6bcd88;hb=d90e2b42211ead2a38afd5590e2937992312795e;hp=cdbe063acd5bbff13418388c9c4278d7a317b05c;hpb=9b99745c5a15f84c24915e2b3882517f6fbc0162;p=ardour.git

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index cdbe063acd..9f7dd85b52 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"
 
@@ -30,8 +30,6 @@
 #include "ardour/auditioner.h"
 #include "ardour/audioplaylist.h"
 #include "ardour/audio_port.h"
-#include "ardour/panner_shell.h"
-#include "ardour/panner.h"
 #include "ardour/data_type.h"
 #include "ardour/region_factory.h"
 
@@ -42,7 +40,7 @@ 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)
@@ -57,13 +55,13 @@ Auditioner::init ()
                 return -1;
         }
 
-	string left = _session.config.get_auditioner_output_left();
-	string right = _session.config.get_auditioner_output_right();
+	string left = Config->get_auditioner_output_left();
+	string right = Config->get_auditioner_output_right();
 
 	vector<string> outputs;
 	_session.engine().get_physical_outputs (DataType::AUDIO, outputs);
 
-	if (left == "default") {
+	if (left.empty() || left == "default") {
                 if (_session.monitor_out()) {
                         left = _session.monitor_out()->input()->audio (0)->name();
                         via_monitor = true;
@@ -74,7 +72,7 @@ Auditioner::init ()
                 }
 	}
 
-	if (right == "default") {
+	if (right.empty() || right == "default") {
                 if (_session.monitor_out()) {
                         right = _session.monitor_out()->input()->audio (1)->name();
                         via_monitor = true;
@@ -85,24 +83,24 @@ Auditioner::init ()
                 }
 	}
 
-	if ((left.length() == 0) && (right.length() == 0)) {
+	if (left.empty() && right.empty()) {
 		warning << _("no outputs available for auditioner - manual connection required") << endmsg;
-		return -1;
-	}
-
-	_main_outs->defer_pan_reset ();
-
-	if (left.length()) {
-		_output->add_port (left, this, DataType::AUDIO);
-	}
+	} else {
 
-	if (right.length()) {
-		_output->add_port (right, this, DataType::AUDIO);
+		_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 ();
 	}
 
-	_main_outs->allow_pan_reset ();
-	_main_outs->reset_panner ();
-
 	_output->changed.connect_same_thread (*this, boost::bind (&Auditioner::output_changed, this, _1, _2));
 
         return 0;
@@ -123,29 +121,6 @@ Auditioner::prepare_playlist ()
 	return *apl;
 }
 
-void
-Auditioner::audition_current_playlist ()
-{
-	if (g_atomic_int_get (&_auditioning)) {
-		/* 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_extent().second;
-	current_frame = 0;
-
-	/* force a panner reset now that we have all channels */
-
-	_main_outs->panner_shell()->configure_io (ChanCount (DataType::AUDIO, _diskstream->n_channels().n_audio()),
-                                                  ChanCount (DataType::AUDIO, n_outputs().n_audio()));
-
-	g_atomic_int_set (&_auditioning, 1);
-}
-
 void
 Auditioner::audition_region (boost::shared_ptr<Region> region)
 {
@@ -161,7 +136,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
 		return;
 	}
 
-	Glib::Mutex::Lock lm (lock);
+	Glib::Threads::Mutex::Lock lm (lock);
 
 	/* copy it */
 
@@ -179,7 +154,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
 
         ProcessorStreams ps;
 	{
-		Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+		Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
 		if (configure_processors (&ps)) {
 			error << string_compose (_("Cannot setup auditioner processing flow for %1 channels"),
@@ -251,12 +226,12 @@ Auditioner::output_changed (IOChange change, void* /*src*/)
 				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 ();
@@ -266,12 +241,12 @@ Auditioner::output_changed (IOChange change, void* /*src*/)
 				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 ("");
 		}
 	}
 }