Fix uninitialised variable causing garbage output from panners in some cases.

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

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index f955c75ea4877c3afcef51708d58a232561ac513..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"
 
@@ -42,6 +41,10 @@ using namespace PBD;
 
 Auditioner::Auditioner (Session& s)
        : AudioTrack (s, "auditioner", Route::Hidden)
+        , current_frame (0)
+        , _auditioning (0)
+        , length (0)
+        , via_monitor (false)
 {
 }
 
@@ -55,19 +58,28 @@ Auditioner::init ()
        string left = _session.config.get_auditioner_output_left();
        string right = _session.config.get_auditioner_output_right();
 
+       vector<string> outputs;
+       _session.engine().get_physical_outputs (DataType::AUDIO, outputs);
+
        if (left == "default") {
                 if (_session.monitor_out()) {
                         left = _session.monitor_out()->input()->audio (0)->name();
+                        via_monitor = true;
                 } else {
-                        left = _session.engine().get_nth_physical_output (DataType::AUDIO, 0);
+                       if (outputs.size() > 0) {
+                               left = outputs[0];
+                       }
                 }
        }
 
        if (right == "default") {
                 if (_session.monitor_out()) {
                         right = _session.monitor_out()->input()->audio (1)->name();
+                        via_monitor = true;
                 } else {
-                        right = _session.engine().get_nth_physical_output (DataType::AUDIO, 1);
+                       if (outputs.size() > 1) {
+                               right = outputs[1];
+                       }
                 }
        }
 
@@ -91,9 +103,6 @@ Auditioner::init ()
 
        _output->changed.connect_same_thread (*this, boost::bind (&Auditioner::output_changed, this, _1, _2));
 
-       the_region.reset ((AudioRegion*) 0);
-       g_atomic_int_set (&_auditioning, 0);
-
         return 0;
 }
 
@@ -112,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_maximum_extent();
-       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)
 {
@@ -154,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);
@@ -166,11 +153,15 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
        }
 
         ProcessorStreams ps;
-        if (configure_processors (&ps)) {
-                error << string_compose (_("Cannot setup auditioner processing flow for %1 channels"), 
-                                         _diskstream->n_channels()) << endmsg;
-                return;
-        }
+       {
+               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+
+               if (configure_processors (&ps)) {
+                       error << string_compose (_("Cannot setup auditioner processing flow for %1 channels"),
+                                                _diskstream->n_channels()) << endmsg;
+                       return;
+               }
+       }
 
        /* force a panner reset now that we have all channels */
 
@@ -179,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 */
 
@@ -194,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;
-       nframes_t this_nframes;
+       bool need_butler = false;
+       framecnt_t this_nframes;
        int ret;
 
        if (g_atomic_int_get (&_auditioning) == 0) {
@@ -207,14 +198,11 @@ Auditioner::play_audition (nframes_t nframes)
 
        this_nframes = min (nframes, length - current_frame);
 
-       _diskstream->prepare ();
-
-       if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, false, false)) != 0) {
+       if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, need_butler)) != 0) {
                silence (nframes);
                return ret;
        }
 
-       need_butler = _diskstream->commit (this_nframes);
        current_frame += this_nframes;
 
        if (current_frame >= length) {
@@ -228,11 +216,15 @@ Auditioner::play_audition (nframes_t nframes)
 void
 Auditioner::output_changed (IOChange change, void* /*src*/)
 {
-       if (change & ConnectionsChanged) {
+       if (change.type & IOChange::ConnectionsChanged) {
                string phys;
                vector<string> connections;
+               vector<string> outputs;
+               _session.engine().get_physical_outputs (DataType::AUDIO, outputs);
                if (_output->nth (0)->get_connections (connections)) {
-                       phys = _session.engine().get_nth_physical_output (DataType::AUDIO, 0);
+                       if (outputs.size() > 0) {
+                               phys = outputs[0];
+                       }
                        if (phys != connections[0]) {
                                _session.config.set_auditioner_output_left (connections[0]);
                        } else {
@@ -245,7 +237,9 @@ Auditioner::output_changed (IOChange change, void* /*src*/)
                connections.clear ();
 
                if (_output->nth (1)->get_connections (connections)) {
-                       phys = _session.engine().get_nth_physical_output (DataType::AUDIO, 1);
+                       if (outputs.size() > 1) {
+                               phys = outputs[1];
+                       }
                        if (phys != connections[0]) {
                                _session.config.set_auditioner_output_right (connections[0]);
                        } else {
@@ -256,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;
+}