X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fauditioner.cc;h=0c7ba0bc1c15b81c4c335ad2430df2a9d5c3485f;hb=e0ff70cf86c01c42f98faf8b0eaf1a8ccf867946;hp=d412a17d6a535fa6bd96a2dddb68be6a2addd5bc;hpb=23e7cf10191270d70357ccf0ed9294f020c7b7ab;p=ardour.git

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index d412a17d6a..0c7ba0bc1c 100644
--- 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"
@@ -41,7 +46,7 @@ using namespace PBD;
 #include "i18n.h"
 
 Auditioner::Auditioner (Session& s)
-	: Track (s, "auditioner", Route::Auditioner)
+	: Track (s, "auditioner", PresentationInfo::Auditioner)
 	, current_frame (0)
 	, _auditioning (0)
 	, length (0)
@@ -68,7 +73,7 @@ Auditioner::init ()
 		return -1;
 	}
 
-	_output->add_port ("Midiaudition", this, DataType::MIDI);
+	_output->add_port ("", this, DataType::MIDI);
 
 	lookup_synth();
 
@@ -80,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);
@@ -96,6 +105,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) {
@@ -159,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));
@@ -184,7 +194,7 @@ Auditioner::connect ()
 				oright->connect (right);
 			}
 		}
-			
+
 	}
 
 	return 0;
@@ -322,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);
@@ -424,7 +438,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 +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);
@@ -509,7 +523,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 +547,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 +616,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);
+}