X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fauditioner.cc;h=baf97292ec96a34dc50f0eb23180e8e0060a9d69;hb=a017411dfab6d85fdbdcb9d4fd17a05f0ee2cc2a;hp=4d99e2f5e00af42bd0dcef7e189c2668d29d76d7;hpb=b65f8073ba306ac2d85133875746767e7c6b0eb6;p=ardour.git diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index 4d99e2f5e0..baf97292ec 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 @@ -29,6 +29,7 @@ #include "ardour/session.h" #include "ardour/auditioner.h" #include "ardour/audioplaylist.h" +#include "ardour/audio_port.h" #include "ardour/panner.h" #include "ardour/data_type.h" #include "ardour/region_factory.h" @@ -41,21 +42,51 @@ 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; } _main_outs->defer_pan_reset (); @@ -65,17 +96,15 @@ Auditioner::Auditioner (Session& s) } if (right.length()) { - audio_diskstream()->add_channel (1); _output->add_port (right, this, DataType::AUDIO); } - + _main_outs->allow_pan_reset (); _main_outs->reset_panner (); - _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 () @@ -96,7 +125,7 @@ Auditioner::prepare_playlist () void Auditioner::audition_current_playlist () { - 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. */ @@ -105,20 +134,20 @@ Auditioner::audition_current_playlist () Glib::Mutex::Lock lm (lock); _diskstream->seek (0); - length = _diskstream->playlist()->get_maximum_extent(); + length = _diskstream->playlist()->get_extent().second; current_frame = 0; /* force a panner reset now that we have all channels */ _main_outs->panner()->reset (n_outputs().n_audio(), _diskstream->n_channels().n_audio()); - g_atomic_int_set (&_active, 1); + g_atomic_int_set (&_auditioning, 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. */ @@ -146,6 +175,13 @@ Auditioner::audition_region (boost::shared_ptr region) audio_diskstream()->remove_channel (_diskstream->n_channels().n_audio() - the_region->n_channels()); } + ProcessorStreams ps; + 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 */ _main_outs->reset_panner(); @@ -164,31 +200,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) { - bool need_butler; + bool need_butler = false; nframes_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, false, false, need_butler)) != 0) { silence (nframes); return ret; } - need_butler = _diskstream->commit (this_nframes); current_frame += this_nframes; if (current_frame >= length) { @@ -202,12 +235,15 @@ Auditioner::play_audition (nframes_t nframes) void Auditioner::output_changed (IOChange change, void* /*src*/) { - string phys; - - if (change & ConnectionsChanged) { + if (change.type & IOChange::ConnectionsChanged) { + string phys; vector connections; + vector outputs; + _session.engine().get_physical_outputs (DataType::AUDIO, outputs); if (_output->nth (0)->get_connections (connections)) { - phys = _session.engine().get_nth_physical_output (DataType::AUDIO, 0); + if (outputs.size() > 0) { + phys = outputs[0]; + } if (phys != connections[0]) { _session.config.set_auditioner_output_left (connections[0]); } else { @@ -216,11 +252,13 @@ Auditioner::output_changed (IOChange change, void* /*src*/) } else { _session.config.set_auditioner_output_left (""); } - + connections.clear (); if (_output->nth (1)->get_connections (connections)) { - phys = _session.engine().get_nth_physical_output (DataType::AUDIO, 1); + if (outputs.size() > 1) { + phys = outputs[1]; + } if (phys != connections[0]) { _session.config.set_auditioner_output_right (connections[0]); } else {