X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fauditioner.cc;h=82ec91cafd160f63a78fc533663f7b4cf26c59bc;hb=7d96960b162d25da87c388a3083775e8770bba56;hp=d6f63c2f9da410183e4e180672016ef4d9cec87d;hpb=449aab3c465bbbf66d221fac3d7ea559f1720357;p=ardour.git

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index d6f63c2f9d..82ec91cafd 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
@@ -19,18 +19,19 @@
 
 #include <glibmm/thread.h>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
-#include <ardour/audio_diskstream.h>
-#include <ardour/audioregion.h>
-#include <ardour/audioengine.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 "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/panner.h"
+#include "ardour/data_type.h"
+#include "ardour/region_factory.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -41,38 +42,37 @@ using namespace PBD;
 Auditioner::Auditioner (Session& s)
 	: AudioTrack (s, "auditioner", Route::Hidden)
 {
-	string left = Config->get_auditioner_output_left();
-	string right = Config->get_auditioner_output_right();
+	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);	
+		left = _session.engine().get_nth_physical_output (DataType::AUDIO, 0);
 	}
 
 	if (right == "default") {
 		right = _session.engine().get_nth_physical_output (DataType::AUDIO, 1);
 	}
-	
+
 	if ((left.length() == 0) && (right.length() == 0)) {
 		warning << _("no outputs available for auditioner - manual connection required") << endmsg;
 		return;
 	}
 
-	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 (1);
-		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);
@@ -110,7 +110,7 @@ Auditioner::audition_current_playlist ()
 
 	/* force a panner reset now that we have all channels */
 
-	_panner->reset (n_outputs().n_audio(), _diskstream->n_channels().n_audio());
+	_main_outs->panner()->reset (n_outputs().n_audio(), _diskstream->n_channels().n_audio());
 
 	g_atomic_int_set (&_active, 1);
 }
@@ -148,7 +148,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
 
 	/* force a panner reset now that we have all channels */
 
-	reset_panner();
+	_main_outs->reset_panner();
 
 	length = the_region->length();
 
@@ -175,7 +175,7 @@ Auditioner::play_audition (nframes_t nframes)
 	int ret;
 
 	if (g_atomic_int_get (&_active) == 0) {
-		silence (nframes, 0);
+		silence (nframes);
 		return 0;
 	}
 
@@ -183,8 +183,8 @@ Auditioner::play_audition (nframes_t nframes)
 
 	_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)) != 0) {
+		silence (nframes);
 		return ret;
 	}
 
@@ -200,34 +200,34 @@ Auditioner::play_audition (nframes_t nframes)
 }
 
 void
-Auditioner::output_changed (IOChange change, void* src)
+Auditioner::output_changed (IOChange change, void* /*src*/)
 {
 	string phys;
 
 	if (change & ConnectionsChanged) {
 		vector<string> connections;
-		if (output (0)->get_connections (connections)) {
+		if (_output->nth (0)->get_connections (connections)) {
 			phys = _session.engine().get_nth_physical_output (DataType::AUDIO, 0);
 			if (phys != connections[0]) {
-				Config->set_auditioner_output_left (connections[0]);
+				_session.config.set_auditioner_output_left (connections[0]);
 			} else {
-				Config->set_auditioner_output_left ("default");
+				_session.config.set_auditioner_output_left ("default");
 			}
 		} else {
-			Config->set_auditioner_output_left ("");
+			_session.config.set_auditioner_output_left ("");
 		}
-		
+
 		connections.clear ();
 
-		if (output (1)->get_connections (connections)) {
+		if (_output->nth (1)->get_connections (connections)) {
 			phys = _session.engine().get_nth_physical_output (DataType::AUDIO, 1);
 			if (phys != connections[0]) {
-				Config->set_auditioner_output_right (connections[0]);
+				_session.config.set_auditioner_output_right (connections[0]);
 			} else {
-				Config->set_auditioner_output_right ("default");
+				_session.config.set_auditioner_output_right ("default");
 			}
 		} else {
-			Config->set_auditioner_output_right ("");
+			_session.config.set_auditioner_output_right ("");
 		}
 	}
 }