X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fauditioner.cc;h=75a40f142db7a7bd30292ef7302662ff671b9245;hb=c0e6f8e4c324c3f44613949b59acd9e864ab263d;hp=6c143568c43c30a37dc005ec562d86d6b27a4be7;hpb=6fa6514cfdb0ce38d93b51197f599dfd091bad1d;p=ardour.git diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index 6c143568c4..75a40f142d 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -17,7 +17,7 @@ */ -#include +#include #include "pbd/error.h" @@ -40,10 +40,13 @@ using namespace PBD; #include "i18n.h" Auditioner::Auditioner (Session& s) - : AudioTrack (s, "auditioner", Route::Hidden) + : AudioTrack (s, "auditioner", Route::Auditioner) , current_frame (0) , _auditioning (0) , length (0) + , _seek_frame (-1) + , _seeking (false) + , _seek_complete (false) , via_monitor (false) { } @@ -54,14 +57,32 @@ Auditioner::init () if (Track::init ()) { return -1; } + + if (connect ()) { + return -1; + } + + _output->changed.connect_same_thread (*this, boost::bind (&Auditioner::output_changed, this, _1, _2)); + + return 0; +} + +Auditioner::~Auditioner () +{ +} - string left = _session.config.get_auditioner_output_left(); - string right = _session.config.get_auditioner_output_right(); +int +Auditioner::connect () +{ + string left = Config->get_auditioner_output_left(); + string right = Config->get_auditioner_output_right(); vector outputs; _session.engine().get_physical_outputs (DataType::AUDIO, outputs); - if (left == "default") { + via_monitor = false; + + if (left.empty() || left == "default") { if (_session.monitor_out()) { left = _session.monitor_out()->input()->audio (0)->name(); via_monitor = true; @@ -72,7 +93,7 @@ Auditioner::init () } } - if (right == "default") { + if (right.empty() || right == "default") { if (_session.monitor_out()) { right = _session.monitor_out()->input()->audio (1)->name(); via_monitor = true; @@ -83,31 +104,49 @@ Auditioner::init () } } - if ((left.length() == 0) && (right.length() == 0)) { - warning << _("no outputs available for auditioner - manual connection required") << endmsg; - return -1; - } + _output->disconnect (this); - _main_outs->defer_pan_reset (); + if (left.empty() && right.empty()) { + if (_output->n_ports().n_audio() == 0) { + /* ports not set up, so must be during startup */ + warning << _("no outputs available for auditioner - manual connection required") << endmsg; + } + } else { - if (left.length()) { - _output->add_port (left, this, DataType::AUDIO); - } + if (_output->n_ports().n_audio() == 0) { - if (right.length()) { - _output->add_port (right, this, DataType::AUDIO); - } + /* create (and connect) new ports */ - _main_outs->allow_pan_reset (); - _main_outs->reset_panner (); + _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 (); - _output->changed.connect_same_thread (*this, boost::bind (&Auditioner::output_changed, this, _1, _2)); + } else { + + /* reconnect existing ports */ - return 0; -} + boost::shared_ptr oleft (_output->nth (0)); + boost::shared_ptr oright (_output->nth (1)); + if (oleft) { + oleft->connect (left); + } + if (oright) { + oright->connect (right); + } + } + + } -Auditioner::~Auditioner () -{ + return 0; } AudioPlaylist& @@ -136,7 +175,7 @@ Auditioner::audition_region (boost::shared_ptr region) return; } - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); /* copy it */ @@ -154,7 +193,7 @@ Auditioner::audition_region (boost::shared_ptr region) ProcessorStreams ps; { - Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); + Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); if (configure_processors (&ps)) { error << string_compose (_("Cannot setup auditioner processing flow for %1 channels"), @@ -167,6 +206,8 @@ Auditioner::audition_region (boost::shared_ptr region) _main_outs->reset_panner(); + _seek_frame = -1; + _seeking = false; length = the_region->length(); int dir; @@ -196,14 +237,44 @@ Auditioner::play_audition (framecnt_t nframes) return 0; } - this_nframes = min (nframes, length - current_frame); +#if 0 // TODO + if (_seeking && _seek_complete) { + // set FADE-IN + } else if (_seek_frame >= 0 && _seek_frame < length && !_seeking) { + // set FADE-OUT -- use/override amp? || use region-gain ? + } +#endif - if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, need_butler)) != 0) { + if (_seeking && _seek_complete) { + _seek_complete = false; + _seeking = false; + _seek_frame = -1; + } + + if(!_seeking) { + /* process audio */ + this_nframes = min (nframes, length - current_frame); + + if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, need_butler)) != 0) { + silence (nframes); + return ret; + } + + current_frame += this_nframes; + + } else { silence (nframes); - return ret; } - current_frame += this_nframes; + if (_seek_frame >= 0 && _seek_frame < length && !_seeking) { + _seek_complete = false; + _seeking = true; + need_butler = true; + } + + if (!_seeking) { + AuditionProgress(current_frame, length); /* emit */ + } if (current_frame >= length) { _session.cancel_audition (); @@ -226,12 +297,12 @@ Auditioner::output_changed (IOChange change, void* /*src*/) phys = outputs[0]; } if (phys != connections[0]) { - _session.config.set_auditioner_output_left (connections[0]); + Config->set_auditioner_output_left (connections[0]); } else { - _session.config.set_auditioner_output_left ("default"); + Config->set_auditioner_output_left ("default"); } } else { - _session.config.set_auditioner_output_left (""); + Config->set_auditioner_output_left (""); } connections.clear (); @@ -241,12 +312,12 @@ Auditioner::output_changed (IOChange change, void* /*src*/) phys = outputs[1]; } if (phys != connections[0]) { - _session.config.set_auditioner_output_right (connections[0]); + Config->set_auditioner_output_right (connections[0]); } else { - _session.config.set_auditioner_output_right ("default"); + Config->set_auditioner_output_right ("default"); } } else { - _session.config.set_auditioner_output_right (""); + Config->set_auditioner_output_right (""); } } }