X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fauditioner.cc;h=d6f63c2f9da410183e4e180672016ef4d9cec87d;hb=22dc575e4cbc35a5d486d6f448332fb721865d57;hp=af3072d215335c8081f1555cb2b6f91cc7f5d674;hpb=30ab1fd61569f9d7fb7410d483fa68cbf9865c37;p=ardour.git diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index af3072d215..d6f63c2f9d 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -15,30 +15,45 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include +#include + #include #include +#include #include #include #include #include #include #include +#include using namespace std; using namespace ARDOUR; +using namespace PBD; + +#include "i18n.h" Auditioner::Auditioner (Session& s) : AudioTrack (s, "auditioner", Route::Hidden) { string left = Config->get_auditioner_output_left(); string right = Config->get_auditioner_output_right(); + + if (left == "default") { + left = _session.engine().get_nth_physical_output (DataType::AUDIO, 0); + } + + if (right == "default") { + right = _session.engine().get_nth_physical_output (DataType::AUDIO, 1); + } if ((left.length() == 0) && (right.length() == 0)) { + warning << _("no outputs available for auditioner - manual connection required") << endmsg; return; } @@ -49,7 +64,7 @@ Auditioner::Auditioner (Session& s) } if (right.length()) { - audio_diskstream().add_channel(); + audio_diskstream()->add_channel (1); add_output_port (right, this, DataType::AUDIO); } @@ -59,7 +74,7 @@ Auditioner::Auditioner (Session& s) IO::output_changed.connect (mem_fun (*this, &Auditioner::output_changed)); - the_region = 0; + the_region.reset ((AudioRegion*) 0); g_atomic_int_set (&_active, 0); } @@ -71,10 +86,10 @@ AudioPlaylist& Auditioner::prepare_playlist () { // FIXME auditioner is still audio-only - AudioPlaylist* const apl = dynamic_cast(_diskstream->playlist()); + boost::shared_ptr apl = boost::dynamic_pointer_cast(_diskstream->playlist()); assert(apl); - apl->clear (false, false); + apl->clear (); return *apl; } @@ -95,13 +110,13 @@ Auditioner::audition_current_playlist () /* force a panner reset now that we have all channels */ - _panner->reset (n_outputs().get(DataType::AUDIO), _diskstream->n_channels().get(DataType::AUDIO)); + _panner->reset (n_outputs().n_audio(), _diskstream->n_channels().n_audio()); g_atomic_int_set (&_active, 1); } void -Auditioner::audition_region (AudioRegion& region) +Auditioner::audition_region (boost::shared_ptr region) { if (g_atomic_int_get (&_active)) { /* don't go via session for this, because we are going @@ -110,20 +125,25 @@ Auditioner::audition_region (AudioRegion& region) cancel_audition (); } + if (boost::dynamic_pointer_cast(region) == 0) { + error << _("Auditioning of non-audio regions not yet supported") << endmsg; + return; + } + Glib::Mutex::Lock lm (lock); - the_region = new AudioRegion (region); + /* copy it */ + + boost::shared_ptr the_region (boost::dynamic_pointer_cast (RegionFactory::create (region))); the_region->set_position (0, this); - _diskstream->playlist()->clear (true, false); - _diskstream->playlist()->add_region (*the_region, 0, 1, false); + _diskstream->playlist()->drop_regions (); + _diskstream->playlist()->add_region (the_region, 0, 1); - while (_diskstream->n_channels().get(DataType::AUDIO) < the_region->n_channels()) { - audio_diskstream().add_channel (); - } - - while (_diskstream->n_channels().get(DataType::AUDIO) > the_region->n_channels()) { - audio_diskstream().remove_channel (); + 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()); } /* force a panner reset now that we have all channels */ @@ -131,16 +151,27 @@ Auditioner::audition_region (AudioRegion& region) reset_panner(); length = the_region->length(); - _diskstream->seek (0); - current_frame = 0; + + int dir; + nframes_t offset = the_region->sync_offset (dir); + + /* can't audition from a negative sync point */ + + if (dir < 0) { + offset = 0; + } + + _diskstream->seek (offset); + current_frame = offset; + g_atomic_int_set (&_active, 1); } int -Auditioner::play_audition (jack_nframes_t nframes) +Auditioner::play_audition (nframes_t nframes) { bool need_butler; - jack_nframes_t this_nframes; + nframes_t this_nframes; int ret; if (g_atomic_int_get (&_active) == 0) { @@ -171,18 +202,32 @@ Auditioner::play_audition (jack_nframes_t nframes) void Auditioner::output_changed (IOChange change, void* src) { + string phys; + if (change & ConnectionsChanged) { - const char ** connections; - connections = output (0)->get_connections (); - if (connections) { - Config->set_auditioner_output_left (connections[0]); - free (connections); + vector connections; + if (output (0)->get_connections (connections)) { + phys = _session.engine().get_nth_physical_output (DataType::AUDIO, 0); + if (phys != connections[0]) { + Config->set_auditioner_output_left (connections[0]); + } else { + Config->set_auditioner_output_left ("default"); + } + } else { + Config->set_auditioner_output_left (""); } - connections = output (1)->get_connections (); - if (connections) { - Config->set_auditioner_output_right (connections[0]); - free (connections); + connections.clear (); + + if (output (1)->get_connections (connections)) { + phys = _session.engine().get_nth_physical_output (DataType::AUDIO, 1); + if (phys != connections[0]) { + Config->set_auditioner_output_right (connections[0]); + } else { + Config->set_auditioner_output_right ("default"); + } + } else { + Config->set_auditioner_output_right (""); } } }