linker-agnostic version of recent commit to get ControlProtocol selection state set...

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

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 3242346e96d094db54ef11a80d07b531c8f83408..f2122cef276ec29a0ad14dca056da63617d1b755 100644 (file)
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -43,10 +43,10 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 Auditioner::Auditioner (Session& s)
-       : Track (s, "auditioner", Route::Auditioner)
+       : Track (s, "auditioner", PresentationInfo::Auditioner)
        , current_frame (0)
        , _auditioning (0)
        , length (0)
@@ -85,18 +85,25 @@ Auditioner::init ()
 
 Auditioner::~Auditioner ()
 {
+       if (asynth) {
+               asynth->drop_references ();
+       }
+       asynth.reset ();
 }
 
 void
 Auditioner::lookup_synth ()
 {
        string plugin_id = Config->get_midi_audition_synth_uri();
-       asynth = boost::shared_ptr<Processor>();
+       asynth.reset ();
        if (!plugin_id.empty()) {
                boost::shared_ptr<Plugin> p;
                p = find_plugin (_session, plugin_id, ARDOUR::LV2);
                if (!p) {
-                       p = find_plugin (_session, "https://community.ardour.org/node/7596", ARDOUR::LV2);
+                       p = find_plugin (_session, "http://gareus.org/oss/lv2/gmsynth", ARDOUR::LV2);
+                       if (!p) {
+                               p = find_plugin (_session, "https://community.ardour.org/node/7596", ARDOUR::LV2);
+                       }
                        if (p) {
                                warning << _("Falling back to Reasonable Synth for Midi Audition") << endmsg;
                        } else {
@@ -130,25 +137,23 @@ Auditioner::connect ()
        via_monitor = false;
 
        if (left.empty() || left == "default") {
-                if (_session.monitor_out()) {
-                        left = _session.monitor_out()->input()->audio (0)->name();
-                        via_monitor = true;
-                } else {
+               if (_session.monitor_out() && _session.monitor_out()->input()->audio (0)) {
+                       left = _session.monitor_out()->input()->audio (0)->name();
+               } else {
                        if (outputs.size() > 0) {
                                left = outputs[0];
                        }
-                }
+               }
        }
 
        if (right.empty() || right == "default") {
-                if (_session.monitor_out()) {
-                        right = _session.monitor_out()->input()->audio (1)->name();
-                        via_monitor = true;
-                } else {
+               if (_session.monitor_out() && _session.monitor_out()->input()->audio (1)) {
+                       right = _session.monitor_out()->input()->audio (1)->name();
+               } else {
                        if (outputs.size() > 1) {
                                right = outputs[1];
                        }
-                }
+               }
        }
 
        _output->disconnect (this);
@@ -165,20 +170,20 @@ Auditioner::connect ()
                        /* create (and connect) new ports */
 
                        _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 ();
 
                } else {
-                       
+
                        /* reconnect existing ports */
 
                        boost::shared_ptr<Port> oleft (_output->nth (0));
@@ -190,7 +195,11 @@ Auditioner::connect ()
                                oright->connect (right);
                        }
                }
-                       
+
+       }
+
+       if (_session.monitor_out () && _output->connected_to (_session.monitor_out ()->input())) {
+               via_monitor = true;
        }
 
        return 0;
@@ -328,12 +337,14 @@ Auditioner::set_diskstream (boost::shared_ptr<Diskstream> ds)
        Track::set_diskstream (ds);
 
        _diskstream->set_track (this);
+#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
        if (Profile->get_trx()) {
                _diskstream->set_destructive (false);
        } else {
                _diskstream->set_destructive (_mode == Destructive);
        }
        _diskstream->set_non_layered (_mode == NonLayered);
+#endif
        _diskstream->set_record_enabled (false);
        _diskstream->request_input_monitoring (false);
 
@@ -482,7 +493,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
                offset = 0;
        }
 
-       _diskstream->seek (offset);
+       _diskstream->seek (offset, true);
        current_frame = offset;
 
        g_atomic_int_set (&_auditioning, 1);
@@ -559,6 +570,14 @@ Auditioner::output_changed (IOChange change, void* /*src*/)
                vector<string> connections;
                vector<string> outputs;
                _session.engine().get_physical_outputs (DataType::AUDIO, outputs);
+
+               if (_session.monitor_out () && _output->connected_to (_session.monitor_out ()->input ())) {
+                       Config->set_auditioner_output_left ("default");
+                       Config->set_auditioner_output_right ("default");
+                       via_monitor = true;
+                       return;
+               }
+
                if (_output->nth (0)->get_connections (connections)) {
                        if (outputs.size() > 0) {
                                phys = outputs[0];