X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fauditioner.cc;h=6c143568c43c30a37dc005ec562d86d6b27a4be7;hb=1db2be2fef7a70f5200bcd96a701f612bbd7ec52;hp=b62d0f340665a7912a63463e78596832a45a992d;hpb=015fc7b39fab97cee1875231694adce43155ceb5;p=ardour.git diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index b62d0f3406..6c143568c4 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2001 Paul Davis + Copyright (C) 2001 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,11 +24,12 @@ #include "ardour/audio_diskstream.h" #include "ardour/audioregion.h" #include "ardour/audioengine.h" +#include "ardour/delivery.h" #include "ardour/route.h" #include "ardour/session.h" #include "ardour/auditioner.h" #include "ardour/audioplaylist.h" -#include "ardour/panner.h" +#include "ardour/audio_port.h" #include "ardour/data_type.h" #include "ardour/region_factory.h" @@ -40,42 +41,69 @@ using namespace PBD; Auditioner::Auditioner (Session& s) : AudioTrack (s, "auditioner", Route::Hidden) + , current_frame (0) + , _auditioning (0) + , length (0) + , via_monitor (false) { +} + +int +Auditioner::init () +{ + if (Track::init ()) { + return -1; + } + string left = _session.config.get_auditioner_output_left(); string right = _session.config.get_auditioner_output_right(); + vector outputs; + _session.engine().get_physical_outputs (DataType::AUDIO, outputs); + if (left == "default") { - left = _session.engine().get_nth_physical_output (DataType::AUDIO, 0); + if (_session.monitor_out()) { + left = _session.monitor_out()->input()->audio (0)->name(); + via_monitor = true; + } else { + if (outputs.size() > 0) { + left = outputs[0]; + } + } } if (right == "default") { - right = _session.engine().get_nth_physical_output (DataType::AUDIO, 1); + if (_session.monitor_out()) { + right = _session.monitor_out()->input()->audio (1)->name(); + via_monitor = true; + } else { + if (outputs.size() > 1) { + right = outputs[1]; + } + } } - + if ((left.length() == 0) && (right.length() == 0)) { warning << _("no outputs available for auditioner - manual connection required") << endmsg; - return; + return -1; } - defer_pan_reset (); + _main_outs->defer_pan_reset (); if (left.length()) { - add_output_port (left, this, DataType::AUDIO); + _output->add_port (left, this, DataType::AUDIO); } if (right.length()) { - audio_diskstream()->add_channel (1); - add_output_port (right, this, DataType::AUDIO); + _output->add_port (right, this, DataType::AUDIO); } - allow_pan_reset (); - - reset_panner (); + _main_outs->allow_pan_reset (); + _main_outs->reset_panner (); - IO::output_changed.connect (mem_fun (*this, &Auditioner::output_changed)); + _output->changed.connect_same_thread (*this, boost::bind (&Auditioner::output_changed, this, _1, _2)); - the_region.reset ((AudioRegion*) 0); - g_atomic_int_set (&_active, 0); + return 0; } Auditioner::~Auditioner () @@ -93,32 +121,10 @@ Auditioner::prepare_playlist () return *apl; } -void -Auditioner::audition_current_playlist () -{ - if (g_atomic_int_get (&_active)) { - /* don't go via session for this, because we are going - to remain active. - */ - cancel_audition (); - } - - Glib::Mutex::Lock lm (lock); - _diskstream->seek (0); - length = _diskstream->playlist()->get_maximum_extent(); - current_frame = 0; - - /* force a panner reset now that we have all channels */ - - _panner->reset (n_outputs().n_audio(), _diskstream->n_channels().n_audio()); - - g_atomic_int_set (&_active, 1); -} - void Auditioner::audition_region (boost::shared_ptr region) { - if (g_atomic_int_get (&_active)) { + if (g_atomic_int_get (&_auditioning)) { /* don't go via session for this, because we are going to remain active. */ @@ -135,7 +141,7 @@ Auditioner::audition_region (boost::shared_ptr region) /* copy it */ boost::shared_ptr the_region (boost::dynamic_pointer_cast (RegionFactory::create (region))); - the_region->set_position (0, this); + the_region->set_position (0); _diskstream->playlist()->drop_regions (); _diskstream->playlist()->add_region (the_region, 0, 1); @@ -146,14 +152,25 @@ Auditioner::audition_region (boost::shared_ptr region) audio_diskstream()->remove_channel (_diskstream->n_channels().n_audio() - the_region->n_channels()); } + ProcessorStreams ps; + { + Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); + + if (configure_processors (&ps)) { + error << string_compose (_("Cannot setup auditioner processing flow for %1 channels"), + _diskstream->n_channels()) << endmsg; + return; + } + } + /* force a panner reset now that we have all channels */ - reset_panner(); + _main_outs->reset_panner(); length = the_region->length(); int dir; - nframes_t offset = the_region->sync_offset (dir); + framecnt_t offset = the_region->sync_offset (dir); /* can't audition from a negative sync point */ @@ -164,31 +181,28 @@ Auditioner::audition_region (boost::shared_ptr region) _diskstream->seek (offset); current_frame = offset; - g_atomic_int_set (&_active, 1); + g_atomic_int_set (&_auditioning, 1); } int -Auditioner::play_audition (nframes_t nframes) +Auditioner::play_audition (framecnt_t nframes) { - bool need_butler; - nframes_t this_nframes; + bool need_butler = false; + framecnt_t this_nframes; int ret; - if (g_atomic_int_get (&_active) == 0) { + if (g_atomic_int_get (&_auditioning) == 0) { silence (nframes); return 0; } this_nframes = min (nframes, length - current_frame); - _diskstream->prepare (); - - if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, false, false)) != 0) { + if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, need_butler)) != 0) { silence (nframes); return ret; } - need_butler = _diskstream->commit (this_nframes); current_frame += this_nframes; if (current_frame >= length) { @@ -200,14 +214,17 @@ Auditioner::play_audition (nframes_t nframes) } void -Auditioner::output_changed (IOChange change, void* src) +Auditioner::output_changed (IOChange change, void* /*src*/) { - string phys; - - if (change & ConnectionsChanged) { + if (change.type & IOChange::ConnectionsChanged) { + string phys; vector connections; - if (output (0)->get_connections (connections)) { - phys = _session.engine().get_nth_physical_output (DataType::AUDIO, 0); + vector outputs; + _session.engine().get_physical_outputs (DataType::AUDIO, outputs); + if (_output->nth (0)->get_connections (connections)) { + if (outputs.size() > 0) { + phys = outputs[0]; + } if (phys != connections[0]) { _session.config.set_auditioner_output_left (connections[0]); } else { @@ -216,11 +233,13 @@ Auditioner::output_changed (IOChange change, void* src) } else { _session.config.set_auditioner_output_left (""); } - + connections.clear (); - if (output (1)->get_connections (connections)) { - phys = _session.engine().get_nth_physical_output (DataType::AUDIO, 1); + if (_output->nth (1)->get_connections (connections)) { + if (outputs.size() > 1) { + phys = outputs[1]; + } if (phys != connections[0]) { _session.config.set_auditioner_output_right (connections[0]); } else { @@ -231,3 +250,23 @@ Auditioner::output_changed (IOChange change, void* src) } } } + +ChanCount +Auditioner::input_streams () const +{ + /* auditioner never has any inputs - its channel configuration + depends solely on the region we are auditioning. + */ + + if (audio_diskstream()) { + return audio_diskstream()->n_channels(); + } + + return ChanCount (); +} + +MonitorState +Auditioner::monitoring_state () const +{ + return MonitoringDisk; +}