make SiP mute gain work ... hopefully without breaking anything else

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

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 8b8f850f8bd6dfde0cff7c973e65dbfae1bda18c..a5db9a21ddcb678ba7a2dad172053c1c5b26f71a 100644 (file)
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -30,6 +30,7 @@
 #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"
@@ -59,12 +60,17 @@ 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];
+                       }
                 }
        }
 
@@ -73,7 +79,9 @@ Auditioner::init ()
                         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];
+                       }
                 }
        }
 
@@ -127,12 +135,13 @@ Auditioner::audition_current_playlist ()
 
        Glib::Mutex::Lock lm (lock);
        _diskstream->seek (0);
-       length = _diskstream->playlist()->get_maximum_extent();
+       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());
+       _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);
 }
@@ -169,11 +178,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 */
 
@@ -182,7 +195,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 */
 
@@ -197,10 +210,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) {
@@ -228,11 +241,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 +262,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 +275,17 @@ 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 ();
+}