X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fauditioner.cc;h=b10ac2ca44d7124dcd31eea8ab5287bd4babc8a8;hb=a7431e21db0cfd570eb77cec021e7ef1d1e7115d;hp=d682dc3617ddd16ecc57b7afe68ef95bf7865b17;hpb=d005e8866bc0799b54341c9b527b0c08d87b3b0a;p=ardour.git diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index d682dc3617..b10ac2ca44 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_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/disk_reader.h" +#include "ardour/midi_playlist.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) @@ -53,6 +58,7 @@ Auditioner::Auditioner (Session& s) , _synth_added (false) , _synth_changed (false) , _queue_panic (false) + , _import_position (0) { } @@ -67,7 +73,7 @@ Auditioner::init () return -1; } - _output->add_port ("Midiaudition", this, DataType::MIDI); + _output->add_port ("", this, DataType::MIDI); lookup_synth(); @@ -79,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) { @@ -123,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); @@ -158,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)); @@ -183,7 +195,11 @@ Auditioner::connect () oright->connect (right); } } - + + } + + if (_session.monitor_out () && _output->connected_to (_session.monitor_out ()->input())) { + via_monitor = true; } return 0; @@ -199,37 +215,8 @@ Auditioner::data_type () const { } } -boost::shared_ptr -Auditioner::create_diskstream () { - - { - AudioDiskstream::Flag dflags = AudioDiskstream::Flag (0); - dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Hidden); - _diskstream_audio = boost::shared_ptr (new AudioDiskstream (_session, name(), dflags)); - } - - { - MidiDiskstream::Flag dflags = MidiDiskstream::Flag (0); - dflags = MidiDiskstream::Flag (dflags | MidiDiskstream::Hidden); - _diskstream_midi = boost::shared_ptr (new MidiDiskstream (_session, name(), dflags)); - _diskstream_midi->do_refill_with_alloc (); - _diskstream_midi->playlist()->set_orig_track_id (id()); - } - - return _diskstream_audio; -} - -int -Auditioner::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& need_butler) { - if (_midi_audition) { - return roll_midi(nframes, start_frame, end_frame, declick, need_butler); - } else { - return roll_audio(nframes, start_frame, end_frame, declick, need_butler); - } -} - int -Auditioner::roll_midi (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& need_butler) +Auditioner::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& need_butler) { Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK); if (!lm.locked()) { @@ -238,17 +225,13 @@ Auditioner::roll_midi (pframes_t nframes, framepos_t start_frame, framepos_t end assert(_active); - framecnt_t playback_distance = nframes; - boost::shared_ptr diskstream = midi_diskstream(); BufferSet& bufs = _session.get_route_buffers (n_process_buffers()); - MidiBuffer& mbuf (bufs.get_midi (0)); - _silent = false; - ChanCount cnt (DataType::MIDI, 1); - cnt.set (DataType::AUDIO, bufs.count().n_audio()); - bufs.set_count (cnt); + _silent = false; + _amp->apply_gain_automation(false); if (_queue_panic) { + MidiBuffer& mbuf (bufs.get_midi (0)); _queue_panic = false; for (uint8_t chn = 0; chn < 0xf; ++chn) { uint8_t buf[3] = { ((uint8_t) (MIDI_CMD_CONTROL | chn)), ((uint8_t) MIDI_CTL_SUSTAIN), 0 }; @@ -258,20 +241,9 @@ Auditioner::roll_midi (pframes_t nframes, framepos_t start_frame, framepos_t end buf[1] = MIDI_CTL_RESET_CONTROLLERS; mbuf.push_back(0, 3, buf); } - process_output_buffers (bufs, start_frame, start_frame+1, 1, false, false); - - for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr d = boost::dynamic_pointer_cast (*i); - if (d) { - d->flush_buffers (nframes); - } - } } - diskstream->get_playback (mbuf, nframes); - - process_output_buffers (bufs, start_frame, end_frame, nframes, - declick, (!diskstream->record_enabled() && !_session.transport_stopped())); + process_output_buffers (bufs, start_frame, end_frame, nframes, declick, !_session.transport_stopped()); for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { boost::shared_ptr d = boost::dynamic_pointer_cast (*i); @@ -280,75 +252,9 @@ Auditioner::roll_midi (pframes_t nframes, framepos_t start_frame, framepos_t end } } - need_butler = diskstream->commit (playback_distance); - return 0; -} - - -int -Auditioner::roll_audio (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& need_butler) { - Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK); - if (!lm.locked()) { - return 0; - } - - assert(n_outputs().n_total() > 0); - assert(_active); - - int dret; - framecnt_t playback_distance; - framepos_t transport_frame = _session.transport_frame(); - boost::shared_ptr diskstream = audio_diskstream(); - BufferSet& bufs = _session.get_route_buffers (n_process_buffers ()); - - _silent = false; - _amp->apply_gain_automation(false); - - if ((dret = diskstream->process (bufs, transport_frame, nframes, playback_distance, (monitoring_state() == MonitoringDisk))) != 0) { - need_butler = diskstream->commit (playback_distance); - silence (nframes); - return dret; - } - - process_output_buffers (bufs, start_frame, end_frame, nframes, declick, (!diskstream->record_enabled() && _session.transport_rolling())); - need_butler = diskstream->commit (playback_distance); return 0; } -void -Auditioner::set_diskstream (boost::shared_ptr ds) -{ - Track::set_diskstream (ds); - - _diskstream->set_track (this); - _diskstream->set_destructive (_mode == Destructive); - _diskstream->set_non_layered (_mode == NonLayered); - _diskstream->set_record_enabled (false); - _diskstream->request_input_monitoring (false); - - DiskstreamChanged (); /* EMIT SIGNAL */ -} - -AudioPlaylist& -Auditioner::prepare_playlist () -{ - // used by CrossfadeEditor::audition() - - _midi_audition = false; - set_diskstream(_diskstream_audio); - if (_synth_added) { - remove_processor(asynth); - _synth_added = false; - } - - // FIXME auditioner is still audio-only - boost::shared_ptr apl = boost::dynamic_pointer_cast(_diskstream->playlist()); - assert(apl); - - apl->clear (); - return *apl; -} - void Auditioner::audition_region (boost::shared_ptr region) { @@ -364,25 +270,20 @@ Auditioner::audition_region (boost::shared_ptr region) if (boost::dynamic_pointer_cast(region) != 0) { _midi_audition = false; - set_diskstream(_diskstream_audio); + if (_synth_added) { remove_processor(asynth); _synth_added = false; } midi_region.reset(); + _import_position = 0; /* copy it */ the_region = boost::dynamic_pointer_cast (RegionFactory::create (region)); the_region->set_position (0); - _diskstream->playlist()->drop_regions (); - _diskstream->playlist()->add_region (the_region, 0, 1); - - if (_diskstream->n_channels().n_audio() < the_region->n_channels()) { - audio_diskstream()->add_channel (the_region->n_channels() - _diskstream->n_channels().n_audio()); - } else if (_diskstream->n_channels().n_audio() > the_region->n_channels()) { - audio_diskstream()->remove_channel (_diskstream->n_channels().n_audio() - the_region->n_channels()); - } + _disk_reader->audio_playlist()->drop_regions (); + _disk_reader->audio_playlist()->add_region (the_region, 0, 1); ProcessorStreams ps; { @@ -390,23 +291,24 @@ Auditioner::audition_region (boost::shared_ptr region) if (configure_processors (&ps)) { error << string_compose (_("Cannot setup auditioner processing flow for %1 channels"), - _diskstream->n_channels()) << endmsg; + region->n_channels()) << endmsg; return; } } } else if (boost::dynamic_pointer_cast(region)) { _midi_audition = true; - set_diskstream(_diskstream_midi); + the_region.reset(); + _import_position = region->position(); /* copy it */ midi_region = (boost::dynamic_pointer_cast (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); - midi_diskstream()->reset_tracker(); + _disk_reader->midi_playlist()->drop_regions (); + _disk_reader->midi_playlist()->add_region (midi_region, _import_position, 1); + _disk_reader->reset_tracker(); ProcessorStreams ps; @@ -419,9 +321,8 @@ Auditioner::audition_region (boost::shared_ptr region) lookup_synth(); } - 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 { @@ -436,7 +337,7 @@ Auditioner::audition_region (boost::shared_ptr region) if (configure_processors (&ps)) { error << string_compose (_("Cannot setup auditioner processing flow for %1 channels"), - _diskstream->n_channels()) << endmsg; + region->n_channels()) << endmsg; return; } } @@ -457,7 +358,7 @@ Auditioner::audition_region (boost::shared_ptr 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); @@ -469,7 +370,7 @@ Auditioner::audition_region (boost::shared_ptr region) offset = 0; } - _diskstream->seek (offset); + _disk_reader->seek (offset, true); current_frame = offset; g_atomic_int_set (&_auditioning, 1); @@ -499,14 +400,12 @@ Auditioner::play_audition (framecnt_t nframes) _seek_complete = false; _seeking = false; _seek_frame = -1; - if (_midi_audition && midi_diskstream()) { - midi_diskstream()->reset_tracker(); - } + _disk_reader->reset_tracker(); } 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 +426,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 { @@ -546,6 +445,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]; @@ -580,18 +487,14 @@ ChanCount Auditioner::input_streams () const { /* auditioner never has any inputs - its channel configuration - depends solely on the region we are auditioning. - */ + depends solely on the region we are auditioning. + */ - if (!_midi_audition && audio_diskstream()) { - return audio_diskstream()->n_channels(); - } - if (_midi_audition && midi_diskstream()) { - ChanCount cnt (DataType::MIDI, 1); - return cnt; + if (_disk_reader) { + return _disk_reader->input_streams (); } - return ChanCount (); + return ChanCount (DataType::AUDIO, 1); } MonitorState @@ -599,3 +502,4 @@ Auditioner::monitoring_state () const { return MonitoringDisk; } +