Move MIDI filters imprecise handling from 2nd pass to 1st

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

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 30a354aa95210da6db4f9cc6be783d7b1f2d4c1d..aa81c3aa927383313ddc2abecb46e0b4e7c5a89d 100644 (file)
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -34,6 +34,7 @@
 #include "ardour/midi_region.h"
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
+#include "ardour/profile.h"
 #include "ardour/region_factory.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
@@ -42,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)
@@ -84,13 +85,17 @@ 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);
@@ -164,20 +169,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));
@@ -189,7 +194,7 @@ Auditioner::connect ()
                                oright->connect (right);
                        }
                }
-                       
+
        }
 
        return 0;
@@ -327,7 +332,11 @@ Auditioner::set_diskstream (boost::shared_ptr<Diskstream> ds)
        Track::set_diskstream (ds);
 
        _diskstream->set_track (this);
-       _diskstream->set_destructive (_mode == Destructive);
+       if (Profile->get_trx()) {
+               _diskstream->set_destructive (false);
+       } else {
+               _diskstream->set_destructive (_mode == Destructive);
+       }
        _diskstream->set_non_layered (_mode == NonLayered);
        _diskstream->set_record_enabled (false);
        _diskstream->request_input_monitoring (false);
@@ -477,7 +486,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);