Merge branch 'master' into saveas

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

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index d682dc3617ddd16ecc57b7afe68ef95bf7865b17..30a354aa95210da6db4f9cc6be783d7b1f2d4c1d 100644 (file)
--- 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"
@@ -53,6 +57,7 @@ Auditioner::Auditioner (Session& s)
        , _synth_added (false)
        , _synth_changed (false)
        , _queue_panic (false)
+       , _import_position (0)
 {
 }
 
@@ -67,7 +72,7 @@ Auditioner::init ()
                return -1;
        }
 
-       _output->add_port ("Midiaudition", this, DataType::MIDI);
+       _output->add_port ("", this, DataType::MIDI);
 
        lookup_synth();
 
@@ -95,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) {
@@ -370,6 +376,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
                        _synth_added = false;
                }
                midi_region.reset();
+               _import_position = 0;
 
                /* copy it */
                the_region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region));
@@ -399,13 +406,14 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
                _midi_audition = true;
                set_diskstream(_diskstream_midi);
                the_region.reset();
+               _import_position = region->position();
 
                /* copy it */
                midi_region = (boost::dynamic_pointer_cast<MidiRegion> (RegionFactory::create (region)));
-               midi_region->set_position (0);
+               midi_region->set_position (_import_position);
 
                _diskstream->playlist()->drop_regions ();
-               _diskstream->playlist()->add_region (midi_region, 0, 1);
+               _diskstream->playlist()->add_region (midi_region, _import_position, 1);
                midi_diskstream()->reset_tracker();
 
                ProcessorStreams ps;
@@ -421,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 {
@@ -457,7 +465,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
 
        if (_midi_audition) {
                length = midi_region->length();
-               offset = midi_region->sync_offset (dir);
+               offset = _import_position + midi_region->sync_offset (dir);
        } else {
                length = the_region->length();
                offset = the_region->sync_offset (dir);
@@ -506,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);
@@ -527,10 +535,10 @@ Auditioner::play_audition (framecnt_t nframes)
        }
 
        if (!_seeking) {
-               AuditionProgress(current_frame, length); /* emit */
+               AuditionProgress(current_frame - _import_position, length); /* emit */
        }
 
-       if (current_frame >= length) {
+       if (current_frame >= length + _import_position) {
                _session.cancel_audition ();
                return 0;
        } else {
@@ -599,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);
+}