X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fauditioner.cc;h=30a354aa95210da6db4f9cc6be783d7b1f2d4c1d;hb=ced4378d0914bcfb926267772c45d1d23f3bed38;hp=31e89d5307314fbd1ab81954c85bcfcb709fe1a8;hpb=330f5fdf2e14b22e8b64c1c037224b636f5df783;p=ardour.git

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 31e89d5307..30a354aa95 100644
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -22,14 +22,18 @@
 #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/region_factory.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
@@ -96,6 +100,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) {
@@ -424,7 +429,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 {
@@ -509,7 +514,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 +538,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 +607,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);
+}