*/
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
#include "pbd/error.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"
#include "i18n.h"
Auditioner::Auditioner (Session& s)
- : AudioTrack (s, "auditioner", Route::Hidden)
+ : AudioTrack (s, "auditioner", Route::Auditioner)
, current_frame (0)
, _auditioning (0)
, length (0)
return -1;
}
- string left = _session.config.get_auditioner_output_left();
- string right = _session.config.get_auditioner_output_right();
+ string left = Config->get_auditioner_output_left();
+ string right = Config->get_auditioner_output_right();
vector<string> outputs;
_session.engine().get_physical_outputs (DataType::AUDIO, outputs);
- if (left == "default") {
+ if (left.empty() || left == "default") {
if (_session.monitor_out()) {
left = _session.monitor_out()->input()->audio (0)->name();
via_monitor = true;
}
}
- if (right == "default") {
+ if (right.empty() || right == "default") {
if (_session.monitor_out()) {
right = _session.monitor_out()->input()->audio (1)->name();
via_monitor = true;
}
}
- if ((left.length() == 0) && (right.length() == 0)) {
+ if (left.empty() && right.empty()) {
warning << _("no outputs available for auditioner - manual connection required") << endmsg;
- return -1;
- }
-
- _main_outs->defer_pan_reset ();
-
- if (left.length()) {
- _output->add_port (left, this, DataType::AUDIO);
- }
+ } else {
- if (right.length()) {
- _output->add_port (right, this, DataType::AUDIO);
+ _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 ();
}
- _main_outs->allow_pan_reset ();
- _main_outs->reset_panner ();
-
_output->changed.connect_same_thread (*this, boost::bind (&Auditioner::output_changed, this, _1, _2));
return 0;
return *apl;
}
-void
-Auditioner::audition_current_playlist ()
-{
- if (g_atomic_int_get (&_auditioning)) {
- /* 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_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 (&_auditioning, 1);
-}
-
void
Auditioner::audition_region (boost::shared_ptr<Region> region)
{
return;
}
- Glib::Mutex::Lock lm (lock);
+ Glib::Threads::Mutex::Lock lm (lock);
/* copy it */
boost::shared_ptr<AudioRegion> the_region (boost::dynamic_pointer_cast<AudioRegion> (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);
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"),
+ error << string_compose (_("Cannot setup auditioner processing flow for %1 channels"),
_diskstream->n_channels()) << endmsg;
return;
}
this_nframes = min (nframes, length - current_frame);
- if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, false, false, need_butler)) != 0) {
+ if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, need_butler)) != 0) {
silence (nframes);
return ret;
}
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 ();
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 ("");
}
}
}
+
+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;
+}