X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fauditioner.cc;h=6c143568c43c30a37dc005ec562d86d6b27a4be7;hb=eaf58fdd50a79aa4fa2760ca5dbeb2dd4cda2e15;hp=7ba5e966fc766d0410e172084a6864d1f390cf47;hpb=8ff34fde9d5bffb2f205a10a160c3a7f15c25141;p=ardour.git

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 7ba5e966fc..6c143568c4 100644
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -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"
 
@@ -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)
 {
@@ -289,3 +264,9 @@ Auditioner::input_streams () const
 
         return ChanCount ();
 }
+
+MonitorState 
+Auditioner::monitoring_state () const
+{
+	return MonitoringDisk;
+}