Marginal cleanup.

[ardour.git] / libs / ardour / auditioner.cc

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 37df6297da90f1efa0084e27e96e0b106fd90d0a..6c143568c43c30a37dc005ec562d86d6b27a4be7 100644 (file)
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -30,7 +30,6 @@
 #include "ardour/auditioner.h"
 #include "ardour/audioplaylist.h"
 #include "ardour/audio_port.h"
-#include "ardour/panner.h"
 #include "ardour/data_type.h"
 #include "ardour/region_factory.h"
 
@@ -122,28 +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()->reset (n_outputs().n_audio(), _diskstream->n_channels().n_audio());
-
-       g_atomic_int_set (&_auditioning, 1);
-}
-
 void
 Auditioner::audition_region (boost::shared_ptr<Region> region)
 {
@@ -164,7 +141,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
        /* copy it */
 
        boost::shared_ptr<AudioRegion> the_region (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region)));
-       the_region->set_position (0, this);
+       the_region->set_position (0);
 
        _diskstream->playlist()->drop_regions ();
        _diskstream->playlist()->add_region (the_region, 0, 1);
@@ -180,7 +157,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
                Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
                if (configure_processors (&ps)) {
-                       error << string_compose (_("Cannot setup auditioner processing flow for %1 channels"), 
+                       error << string_compose (_("Cannot setup auditioner processing flow for %1 channels"),
                                                 _diskstream->n_channels()) << endmsg;
                        return;
                }
@@ -193,7 +170,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
        length = the_region->length();
 
        int dir;
-       nframes_t offset = the_region->sync_offset (dir);
+       framecnt_t offset = the_region->sync_offset (dir);
 
        /* can't audition from a negative sync point */
 
@@ -208,10 +185,10 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
 }
 
 int
-Auditioner::play_audition (nframes_t nframes)
+Auditioner::play_audition (framecnt_t nframes)
 {
        bool need_butler = false;
-       nframes_t this_nframes;
+       framecnt_t this_nframes;
        int ret;
 
        if (g_atomic_int_get (&_auditioning) == 0) {
@@ -221,7 +198,7 @@ Auditioner::play_audition (nframes_t nframes)
 
        this_nframes = min (nframes, length - current_frame);
 
-       if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, false, false, need_butler)) != 0) {
+       if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, need_butler)) != 0) {
                silence (nframes);
                return ret;
        }
@@ -273,3 +250,23 @@ Auditioner::output_changed (IOChange change, void* /*src*/)
                }
        }
 }
+
+ChanCount
+Auditioner::input_streams () const
+{
+        /* auditioner never has any inputs - its channel configuration
+           depends solely on the region we are auditioning.
+        */
+
+        if (audio_diskstream()) {
+                return audio_diskstream()->n_channels();
+        }
+
+        return ChanCount ();
+}
+
+MonitorState 
+Auditioner::monitoring_state () const
+{
+       return MonitoringDisk;
+}