Use glib to open our 'recent file' list, rather than opening directly with ifstream...

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

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 31e89d5307314fbd1ab81954c85bcfcb709fe1a8..27d56d7e1b4b98b687af0e9a9dd1b9cea1e73807 100644 (file)
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -22,14 +22,19 @@
 #include "pbd/error.h"
 
 #include "ardour/amp.h"
-#include "ardour/audioregion.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/audio_port.h"
 #include "ardour/audioengine.h"
 #include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
 #include "ardour/auditioner.h"
-#include "ardour/audio_port.h"
 #include "ardour/data_type.h"
 #include "ardour/delivery.h"
+#include "ardour/midi_diskstream.h"
+#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"
@@ -96,6 +101,7 @@ Auditioner::lookup_synth ()
                                warning << _("Falling back to Reasonable Synth for Midi Audition") << endmsg;
                        } else {
                                warning << _("No synth for midi-audition found.") << endmsg;
+                               Config->set_midi_audition_synth_uri(""); // Don't check again for Reasonable Synth (ie --no-lv2)
                        }
                }
                if (p) {
@@ -322,7 +328,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);
@@ -424,7 +434,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
 
 
                if (!_synth_added && asynth) {
-                       int rv = add_processor_by_index(asynth, PreFader, &ps, true);
+                       int rv = add_processor (asynth, PreFader, &ps, true);
                        if (rv) {
                                error << _("Failed to load synth for MIDI-Audition.") << endmsg;
                        } else {
@@ -472,7 +482,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);
@@ -509,7 +519,7 @@ Auditioner::play_audition (framecnt_t nframes)
 
        if(!_seeking) {
                /* process audio */
-               this_nframes = min (nframes, length - current_frame);
+               this_nframes = min (nframes, length - current_frame + _import_position);
 
                if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, need_butler)) != 0) {
                        silence (nframes);
@@ -533,7 +543,7 @@ Auditioner::play_audition (framecnt_t nframes)
                AuditionProgress(current_frame - _import_position, length); /* emit */
        }
 
-       if (current_frame >= length) {
+       if (current_frame >= length + _import_position) {
                _session.cancel_audition ();
                return 0;
        } else {
@@ -602,3 +612,15 @@ Auditioner::monitoring_state () const
 {
        return MonitoringDisk;
 }
+
+boost::shared_ptr<AudioDiskstream>
+Auditioner::audio_diskstream() const
+{
+       return boost::dynamic_pointer_cast<AudioDiskstream> (_diskstream);
+}
+
+boost::shared_ptr<MidiDiskstream>
+Auditioner::midi_diskstream() const
+{
+       return boost::dynamic_pointer_cast<MidiDiskstream> (_diskstream);
+}