X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fauditioner.cc;h=f2122cef276ec29a0ad14dca056da63617d1b755;hb=0f20819c8643974ce6d52fc1dc7ec3a18877d05b;hp=d412a17d6a535fa6bd96a2dddb68be6a2addd5bc;hpb=86343b6c15a3a43f082802484d2bc813d34db821;p=ardour.git diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index d412a17d6a..f2122cef27 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" @@ -38,10 +43,10 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -#include "i18n.h" +#include "pbd/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,22 +85,30 @@ 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(); + asynth.reset (); if (!plugin_id.empty()) { boost::shared_ptr p; p = find_plugin (_session, plugin_id, ARDOUR::LV2); if (!p) { - p = find_plugin (_session, "https://community.ardour.org/node/7596", ARDOUR::LV2); + p = find_plugin (_session, "http://gareus.org/oss/lv2/gmsynth", ARDOUR::LV2); + if (!p) { + p = find_plugin (_session, "https://community.ardour.org/node/7596", ARDOUR::LV2); + } if (p) { 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) { @@ -124,25 +137,23 @@ Auditioner::connect () via_monitor = false; if (left.empty() || left == "default") { - if (_session.monitor_out()) { - left = _session.monitor_out()->input()->audio (0)->name(); - via_monitor = true; - } else { + if (_session.monitor_out() && _session.monitor_out()->input()->audio (0)) { + left = _session.monitor_out()->input()->audio (0)->name(); + } else { if (outputs.size() > 0) { left = outputs[0]; } - } + } } if (right.empty() || right == "default") { - if (_session.monitor_out()) { - right = _session.monitor_out()->input()->audio (1)->name(); - via_monitor = true; - } else { + if (_session.monitor_out() && _session.monitor_out()->input()->audio (1)) { + right = _session.monitor_out()->input()->audio (1)->name(); + } else { if (outputs.size() > 1) { right = outputs[1]; } - } + } } _output->disconnect (this); @@ -159,20 +170,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 oleft (_output->nth (0)); @@ -184,7 +195,11 @@ Auditioner::connect () oright->connect (right); } } - + + } + + if (_session.monitor_out () && _output->connected_to (_session.monitor_out ()->input())) { + via_monitor = true; } return 0; @@ -322,8 +337,14 @@ Auditioner::set_diskstream (boost::shared_ptr ds) Track::set_diskstream (ds); _diskstream->set_track (this); - _diskstream->set_destructive (_mode == Destructive); +#ifdef XXX_OLD_DESTRUCTIVE_API_XXX + if (Profile->get_trx()) { + _diskstream->set_destructive (false); + } else { + _diskstream->set_destructive (_mode == Destructive); + } _diskstream->set_non_layered (_mode == NonLayered); +#endif _diskstream->set_record_enabled (false); _diskstream->request_input_monitoring (false); @@ -424,7 +445,7 @@ Auditioner::audition_region (boost::shared_ptr 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 +493,7 @@ Auditioner::audition_region (boost::shared_ptr region) offset = 0; } - _diskstream->seek (offset); + _diskstream->seek (offset, true); current_frame = offset; g_atomic_int_set (&_auditioning, 1); @@ -509,7 +530,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 +554,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 { @@ -549,6 +570,14 @@ Auditioner::output_changed (IOChange change, void* /*src*/) vector connections; vector outputs; _session.engine().get_physical_outputs (DataType::AUDIO, outputs); + + if (_session.monitor_out () && _output->connected_to (_session.monitor_out ()->input ())) { + Config->set_auditioner_output_left ("default"); + Config->set_auditioner_output_right ("default"); + via_monitor = true; + return; + } + if (_output->nth (0)->get_connections (connections)) { if (outputs.size() > 0) { phys = outputs[0]; @@ -602,3 +631,15 @@ Auditioner::monitoring_state () const { return MonitoringDisk; } + +boost::shared_ptr +Auditioner::audio_diskstream() const +{ + return boost::dynamic_pointer_cast (_diskstream); +} + +boost::shared_ptr +Auditioner::midi_diskstream() const +{ + return boost::dynamic_pointer_cast (_diskstream); +}