Auditioner::Auditioner (Session& s)
: AudioTrack (s, "auditioner", Route::Hidden)
+ , current_frame (0)
+ , _auditioning (0)
+ , length (0)
+ , via_monitor (false)
{
}
string left = _session.config.get_auditioner_output_left();
string right = _session.config.get_auditioner_output_right();
+ vector<string> outputs;
+ _session.engine().get_physical_outputs (DataType::AUDIO, outputs);
+
if (left == "default") {
if (_session.monitor_out()) {
left = _session.monitor_out()->input()->audio (0)->name();
+ via_monitor = true;
} else {
- left = _session.engine().get_nth_physical_output (DataType::AUDIO, 0);
+ if (outputs.size() > 0) {
+ left = outputs[0];
+ }
}
}
if (right == "default") {
if (_session.monitor_out()) {
right = _session.monitor_out()->input()->audio (1)->name();
+ via_monitor = true;
} else {
- right = _session.engine().get_nth_physical_output (DataType::AUDIO, 1);
+ if (outputs.size() > 1) {
+ right = outputs[1];
+ }
}
}
_output->changed.connect_same_thread (*this, boost::bind (&Auditioner::output_changed, this, _1, _2));
- the_region.reset ((AudioRegion*) 0);
- g_atomic_int_set (&_auditioning, 0);
-
return 0;
}
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 */
}
ProcessorStreams ps;
- if (configure_processors (&ps)) {
- error << string_compose (_("Cannot setup auditioner processing flow for %1 channels"),
- _diskstream->n_channels()) << endmsg;
- return;
- }
+ {
+ Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+
+ 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 */
int
Auditioner::play_audition (nframes_t nframes)
{
- bool need_butler;
+ bool need_butler = false;
nframes_t this_nframes;
int ret;
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) {
void
Auditioner::output_changed (IOChange change, void* /*src*/)
{
- if (change & ConnectionsChanged) {
+ if (change.type & IOChange::ConnectionsChanged) {
string phys;
vector<string> connections;
+ vector<string> 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 {
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 {