another unusued parameter fix

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

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 71730ad0bb415db50dd35cdd4166e7164738f6de..7c1a2e1e2b81be51be613b1c2804c9759ec82213 100644 (file)
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "pbd/error.h"
 
@@ -30,8 +30,6 @@
 #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"
 
@@ -57,8 +55,8 @@ Auditioner::init ()
                 return -1;
         }
 
-       string left = _session.config.get_auditioner_output_left();
-       string right = _session.config.get_auditioner_output_right();
+       string left = Config->get_auditioner_output_left();
+       string right = Config->get_auditioner_output_right();
 
        vector<string> outputs;
        _session.engine().get_physical_outputs (DataType::AUDIO, outputs);
@@ -85,24 +83,24 @@ Auditioner::init ()
                 }
        }
 
-       if ((left.length() == 0) && (right.length() == 0)) {
+       if (left.empty() && right.empty()) {
                warning << _("no outputs available for auditioner - manual connection required") << endmsg;
-               return -1;
-       }
-
-       _main_outs->defer_pan_reset ();
-
-       if (left.length()) {
-               _output->add_port (left, this, DataType::AUDIO);
-       }
+       } else {
 
-       if (right.length()) {
-               _output->add_port (right, this, DataType::AUDIO);
+               _main_outs->defer_pan_reset ();
+               
+               if (left.length()) {
+                       _output->add_port (left, this, DataType::AUDIO);
+               }
+               
+               if (right.length()) {
+                       _output->add_port (right, this, DataType::AUDIO);
+               }
+               
+               _main_outs->allow_pan_reset ();
+               _main_outs->reset_panner ();
        }
 
-       _main_outs->allow_pan_reset ();
-       _main_outs->reset_panner ();
-
        _output->changed.connect_same_thread (*this, boost::bind (&Auditioner::output_changed, this, _1, _2));
 
         return 0;
@@ -138,7 +136,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
                return;
        }
 
-       Glib::Mutex::Lock lm (lock);
+       Glib::Threads::Mutex::Lock lm (lock);
 
        /* copy it */
 
@@ -156,7 +154,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
 
         ProcessorStreams ps;
        {
-               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
                if (configure_processors (&ps)) {
                        error << string_compose (_("Cannot setup auditioner processing flow for %1 channels"),
@@ -228,12 +226,12 @@ Auditioner::output_changed (IOChange change, void* /*src*/)
                                phys = outputs[0];
                        }
                        if (phys != connections[0]) {
-                               _session.config.set_auditioner_output_left (connections[0]);
+                               Config->set_auditioner_output_left (connections[0]);
                        } else {
-                               _session.config.set_auditioner_output_left ("default");
+                               Config->set_auditioner_output_left ("default");
                        }
                } else {
-                       _session.config.set_auditioner_output_left ("");
+                       Config->set_auditioner_output_left ("");
                }
 
                connections.clear ();
@@ -243,12 +241,12 @@ Auditioner::output_changed (IOChange change, void* /*src*/)
                                phys = outputs[1];
                        }
                        if (phys != connections[0]) {
-                               _session.config.set_auditioner_output_right (connections[0]);
+                               Config->set_auditioner_output_right (connections[0]);
                        } else {
-                               _session.config.set_auditioner_output_right ("default");
+                               Config->set_auditioner_output_right ("default");
                        }
                } else {
-                       _session.config.set_auditioner_output_right ("");
+                       Config->set_auditioner_output_right ("");
                }
        }
 }