Remove unused playlist audition code.

git-svn-id: svn://localhost/ardour2/branches/3.0@11897 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h
index 8c5a21bea6fd3c539643a73fbfb473476ee86ba3..3650f0c92c898c99ca16aeb3e931a16eeaed08b5 100644 (file)
--- 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 cdbe063acd5bbff13418388c9c4278d7a317b05c..71730ad0bb415db50dd35cdd4166e7164738f6de 100644 (file)
--- 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 edb8ba80cf6456719da7f391bb71701ac41d2a92..7416187cf5439245b0740feccff1d2f5dca074c0 100644 (file)
--- 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 */
 }