X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fauditioner.cc;h=9db604cd5480d4b22dc630a3f449b6c8885755e7;hb=33da74c8e353ac56194956cae8e2b7d74ec1a1b0;hp=0ba30b2b8be5503878bdaa6e15356b23d20ee367;hpb=2a52135c663e9a60b5f0cc9cc6673799c3ea5549;p=ardour.git diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index 0ba30b2b8b..9db604cd54 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 @@ -19,18 +19,19 @@ #include -#include +#include "pbd/error.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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/data_type.h" +#include "ardour/region_factory.h" using namespace std; using namespace ARDOUR; @@ -41,38 +42,37 @@ using namespace PBD; Auditioner::Auditioner (Session& s) : AudioTrack (s, "auditioner", Route::Hidden) { - string left = Config->get_auditioner_output_left(); - string right = Config->get_auditioner_output_right(); + string left = _session.config.get_auditioner_output_left(); + string right = _session.config.get_auditioner_output_right(); if (left == "default") { - left = _session.engine().get_nth_physical_output (DataType::AUDIO, 0); + 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; } - 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 (mem_fun (*this, &Auditioner::output_changed)); the_region.reset ((AudioRegion*) 0); g_atomic_int_set (&_active, 0); @@ -110,7 +110,7 @@ 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)); + _main_outs->panner()->reset (n_outputs().n_audio(), _diskstream->n_channels().n_audio()); g_atomic_int_set (&_active, 1); } @@ -137,22 +137,33 @@ Auditioner::audition_region (boost::shared_ptr region) boost::shared_ptr the_region (boost::dynamic_pointer_cast (RegionFactory::create (region))); the_region->set_position (0, this); - _diskstream->playlist()->clear (); + _diskstream->playlist()->drop_regions (); _diskstream->playlist()->add_region (the_region, 0, 1); - if (_diskstream->n_channels().get(DataType::AUDIO) < the_region->n_channels()) { - audio_diskstream()->add_channel (the_region->n_channels() - _diskstream->n_channels().get(DataType::AUDIO)); - } else if (_diskstream->n_channels().get(DataType::AUDIO) > the_region->n_channels()) { - audio_diskstream()->remove_channel (_diskstream->n_channels().get(DataType::AUDIO) - the_region->n_channels()); + 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 */ - reset_panner(); + _main_outs->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); } @@ -164,7 +175,7 @@ Auditioner::play_audition (nframes_t nframes) int ret; if (g_atomic_int_get (&_active) == 0) { - silence (nframes, 0); + silence (nframes); return 0; } @@ -172,8 +183,8 @@ Auditioner::play_audition (nframes_t nframes) _diskstream->prepare (); - if ((ret = roll (this_nframes, current_frame, current_frame + nframes, 0, false, false, false)) != 0) { - silence (nframes, 0); + if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, false, false)) != 0) { + silence (nframes); return ret; } @@ -189,36 +200,34 @@ 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) { - const char ** connections; - connections = output (0)->get_connections (); - if (connections) { + vector connections; + if (_output->nth (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]); + _session.config.set_auditioner_output_left (connections[0]); } else { - Config->set_auditioner_output_left ("default"); + _session.config.set_auditioner_output_left ("default"); } - free (connections); } else { - Config->set_auditioner_output_left (""); + _session.config.set_auditioner_output_left (""); } - - connections = output (1)->get_connections (); - if (connections) { + + connections.clear (); + + if (_output->nth (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]); + _session.config.set_auditioner_output_right (connections[0]); } else { - Config->set_auditioner_output_right ("default"); + _session.config.set_auditioner_output_right ("default"); } - free (connections); } else { - Config->set_auditioner_output_right (""); + _session.config.set_auditioner_output_right (""); } } }