From 91b6f28a9b7aa65a3a3a327a1ded486ce9174019 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Wed, 11 Apr 2012 15:10:12 +0000
Subject: [PATCH] Remove unused playlist audition code.

git-svn-id: svn://localhost/ardour2/branches/3.0@11897 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/ardour/auditioner.h |  1 -
 libs/ardour/auditioner.cc       | 23 -----------------------
 libs/ardour/session.cc          |  9 +++------
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h
index 8c5a21bea6..3650f0c92c 100644
--- a/libs/ardour/ardour/auditioner.h
+++ b/libs/ardour/ardour/auditioner.h
@@ -44,7 +44,6 @@ class Auditioner : public AudioTrack
 	void audition_region (boost::shared_ptr<Region>);
 
 	ARDOUR::AudioPlaylist& prepare_playlist ();
-	void audition_current_playlist ();
 
 	int play_audition (framecnt_t nframes);
 
diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index cdbe063acd..71730ad0bb 100644
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -123,29 +123,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)
 {
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index edb8ba80cf..7416187cf5 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -3419,12 +3419,9 @@ Session::audition_playlist ()
 void
 Session::non_realtime_set_audition ()
 {
-	if (!pending_audition_region) {
-		auditioner->audition_current_playlist ();
-	} else {
-		auditioner->audition_region (pending_audition_region);
-		pending_audition_region.reset ();
-	}
+	assert (pending_audition_region);
+	auditioner->audition_region (pending_audition_region);
+	pending_audition_region.reset ();
 	AuditionActive (true); /* EMIT SIGNAL */
 }