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];
+ }
}
}
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];
+ }
}
}
}
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 */
length = the_region->length();
int dir;
- nframes_t offset = the_region->sync_offset (dir);
+ framecnt_t offset = the_region->sync_offset (dir);
/* can't audition from a negative sync point */
}
int
-Auditioner::play_audition (nframes_t nframes)
+Auditioner::play_audition (framecnt_t nframes)
{
bool need_butler = false;
- nframes_t this_nframes;
+ framecnt_t this_nframes;
int ret;
if (g_atomic_int_get (&_auditioning) == 0) {
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 {