#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"
return -1;
}
- _output->add_port ("Midiaudition", this, DataType::MIDI);
+ _output->add_port ("", this, DataType::MIDI);
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) {
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 {
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);
AuditionProgress(current_frame - _import_position, length); /* emit */
}
- if (current_frame >= length) {
+ if (current_frame >= length + _import_position) {
_session.cancel_audition ();
return 0;
} else {
{
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);
+}