X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fengine_dialog.cc;h=29aa448faf5d58953efdb922cad315322fde7d1f;hb=d9f24a46aa95e6cd0afa55d14702565a67cf9e9d;hp=a1beea676b1f32d4dc7da4aa611db6cee2de4f67;hpb=dd6ee69ef85f7840bbd67f3c89507f4c66bb77bd;p=ardour.git diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index a1beea676b..29aa448faf 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -48,6 +48,7 @@ #include "pbd/convert.h" #include "pbd/error.h" +#include "opts.h" #include "ardour_ui.h" #include "engine_dialog.h" #include "gui_thread.h" @@ -285,14 +286,11 @@ EngineControl::EngineControl () } if (backend_combo.get_active_text().empty()) { + PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); backend_combo.set_active_text (backend_names.front()); } - { - /* ignore: don't save state */ - PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); - backend_changed (); - } + backend_changed (); /* in case the setting the backend failed, e.g. stale config, from set_state(), try again */ if (0 == ARDOUR::AudioEngine::instance()->current_backend()) { @@ -311,6 +309,9 @@ EngineControl::EngineControl () device_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::device_changed)); midi_option_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::midi_option_changed)); + input_device_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::input_device_changed)); + output_device_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::output_device_changed)); + input_latency.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed)); output_latency.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed)); input_channels.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed)); @@ -327,7 +328,13 @@ void EngineControl::on_show () { ArdourDialog::on_show (); + if (!ARDOUR::AudioEngine::instance()->current_backend() || !ARDOUR::AudioEngine::instance()->running()) { + // re-check _have_control (jackd running) see #6041 + backend_changed (); + } device_changed (); + input_device_changed (); + output_device_changed (); ok_button->grab_focus(); } @@ -341,9 +348,28 @@ EngineControl::on_response (int response_id) push_state_to_backend (true); break; case RESPONSE_OK: +#ifdef PLATFORM_WINDOWS + // For some reason we don't understand, 'hide()' + // needs to get called first in Windows + hide (); + + // But if there's no session open, this can produce + // a long gap when nothing appears to be happening. + // Let's show the splash image while we're waiting. + if ( !ARDOUR_COMMAND_LINE::no_splash ) { + if ( ARDOUR_UI::instance() ) { + if ( !ARDOUR_UI::instance()->session_loaded ) { + ARDOUR_UI::instance()->show_splash(); + } + } + } + push_state_to_backend (true); + break; +#else push_state_to_backend (true); hide (); break; +#endif case RESPONSE_DELETE_EVENT: { GdkEventButton ev; @@ -415,10 +441,26 @@ EngineControl::build_full_control_notebook () row++; } - label = manage (left_aligned_label (_("Device:"))); - basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0); - basic_packer.attach (device_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0); - row++; + if (backend->use_separate_input_and_output_devices()) { + label = manage (left_aligned_label (_("Input Device:"))); + basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0); + basic_packer.attach (input_device_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0); + row++; + label = manage (left_aligned_label (_("Output Device:"))); + basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0); + basic_packer.attach (output_device_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0); + row++; + // reset so it isn't used in state comparisons + device_combo.set_active_text (""); + } else { + label = manage (left_aligned_label (_("Device:"))); + basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0); + basic_packer.attach (device_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0); + row++; + // reset these so they don't get used in state comparisons + input_device_combo.set_active_text (""); + output_device_combo.set_active_text (""); + } label = manage (left_aligned_label (_("Sample rate:"))); basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0); @@ -493,7 +535,7 @@ EngineControl::build_full_control_notebook () basic_packer.attach (lm_button_audio, 3, 4, row-1, row+1, xopt, xopt); ++row; - label = manage (left_aligned_label (_("MIDI System"))); + label = manage (left_aligned_label (_("MIDI System:"))); basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0); basic_packer.attach (midi_option_combo, 1, 2, row, row + 1, SHRINK, (AttachOptions) 0); basic_packer.attach (midi_devices_button, 3, 4, row, row+1, xopt, xopt); @@ -795,7 +837,6 @@ bool EngineControl::print_channel_count (Gtk::SpinButton* sb) { if (ARDOUR::Profile->get_mixbus()) { - cout << "Mixbus crash trap. sb->get_value(): " << sb->get_value(); return true; } @@ -810,14 +851,11 @@ EngineControl::print_channel_count (Gtk::SpinButton* sb) return true; } -void -EngineControl::list_devices () +// @return true if there are devices available +bool +EngineControl::set_device_popdown_strings () { boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); - assert (backend); - - /* now fill out devices, mark sample rates, buffer sizes insensitive */ - vector all_devices = backend->enumerate_devices (); /* NOTE: Ardour currently does not display the "available" field of the @@ -835,8 +873,8 @@ EngineControl::list_devices () available_devices.push_back (i->name); } - if (!available_devices.empty()) { + if (!available_devices.empty()) { update_sensitivity (); { @@ -864,7 +902,124 @@ EngineControl::list_devices () } device_changed (); + return true; + } + return false; +} + +// @return true if there are input devices available +bool +EngineControl::set_input_device_popdown_strings () +{ + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + vector all_devices = backend->enumerate_input_devices (); + + vector available_devices; + + for (vector::const_iterator i = all_devices.begin(); i != all_devices.end(); ++i) { + available_devices.push_back (i->name); + } + + if (!available_devices.empty()) { + update_sensitivity (); + + { + string current_device, found_device; + current_device = input_device_combo.get_active_text (); + if (current_device == "") { + current_device = backend->input_device_name (); + } + + // Make sure that the active text is still relevant for this + // device (it might only be relevant to the previous device!!) + for (vector::const_iterator i = available_devices.begin(); i != available_devices.end(); ++i) { + if (*i == current_device) + found_device = current_device; + } + if (found_device == "") + // device has never been set (or was not relevant + // for this backend) Let's make sure it's not blank + current_device = available_devices.front (); + + PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); + set_popdown_strings (input_device_combo, available_devices); + + input_device_combo.set_active_text (current_device); + } + + input_device_changed (); + return true; + } + + return false; +} + +// @return true if there are output devices available +bool +EngineControl::set_output_device_popdown_strings () +{ + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + vector all_devices = backend->enumerate_output_devices (); + + vector available_devices; + + for (vector::const_iterator i = all_devices.begin(); i != all_devices.end(); ++i) { + available_devices.push_back (i->name); + } + if (!available_devices.empty()) { + update_sensitivity (); + + { + string current_device, found_device; + current_device = output_device_combo.get_active_text (); + if (current_device == "") { + current_device = backend->output_device_name (); + } + + // Make sure that the active text is still relevant for this + // device (it might only be relevant to the previous device!!) + for (vector::const_iterator i = available_devices.begin(); i != available_devices.end(); ++i) { + if (*i == current_device) + found_device = current_device; + } + if (found_device == "") + // device has never been set (or was not relevant + // for this backend) Let's make sure it's not blank + current_device = available_devices.front (); + + PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); + set_popdown_strings (output_device_combo, available_devices); + + output_device_combo.set_active_text (current_device); + } + + output_device_changed (); + return true; + } + + return false; +} + +void +EngineControl::list_devices () +{ + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + assert (backend); + + /* now fill out devices, mark sample rates, buffer sizes insensitive */ + + bool devices_available = false; + + if (backend->use_separate_input_and_output_devices ()) { + bool input_devices_available = set_input_device_popdown_strings (); + bool output_devices_available = set_output_device_popdown_strings (); + devices_available = input_devices_available || output_devices_available; + } else { + devices_available = set_device_popdown_strings (); + } + + if (devices_available) { input_latency.set_sensitive (true); output_latency.set_sensitive (true); input_channels.set_sensitive (true); @@ -875,6 +1030,8 @@ EngineControl::list_devices () } else { device_combo.clear(); + input_device_combo.clear(); + output_device_combo.clear(); sample_rate_combo.set_sensitive (false); buffer_size_combo.set_sensitive (false); input_latency.set_sensitive (false); @@ -913,13 +1070,98 @@ EngineControl::driver_changed () } void -EngineControl::device_changed () +EngineControl::set_samplerate_popdown_strings (const std::string& device_name) +{ + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + string desired; + vector sr; + vector s; + + if (_have_control) { + sr = backend->available_sample_rates (device_name); + } else { + + sr.push_back (8000.0f); + sr.push_back (16000.0f); + sr.push_back (32000.0f); + sr.push_back (44100.0f); + sr.push_back (48000.0f); + sr.push_back (88200.0f); + sr.push_back (96000.0f); + sr.push_back (192000.0f); + sr.push_back (384000.0f); + } + + for (vector::const_iterator x = sr.begin(); x != sr.end(); ++x) { + s.push_back (rate_as_string (*x)); + if (*x == _desired_sample_rate) { + desired = s.back(); + } + } + + if (!s.empty()) { + sample_rate_combo.set_sensitive (true); + set_popdown_strings (sample_rate_combo, s); + + if (desired.empty()) { + sample_rate_combo.set_active_text (rate_as_string (backend->default_sample_rate())); + } else { + sample_rate_combo.set_active_text (desired); + } + + } else { + sample_rate_combo.set_sensitive (false); + } +} + +void +EngineControl::set_buffersize_popdown_strings (const std::string& device_name) { + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + vector bs; + vector s; + if (_have_control) { + bs = backend->available_buffer_sizes (device_name); + } else if (backend->can_change_buffer_size_when_running()) { + bs.push_back (8); + bs.push_back (16); + bs.push_back (32); + bs.push_back (64); + bs.push_back (128); + bs.push_back (256); + bs.push_back (512); + bs.push_back (1024); + bs.push_back (2048); + bs.push_back (4096); + bs.push_back (8192); + } + s.clear (); + for (vector::const_iterator x = bs.begin(); x != bs.end(); ++x) { + s.push_back (bufsize_as_string (*x)); + } + + if (!s.empty()) { + buffer_size_combo.set_sensitive (true); + set_popdown_strings (buffer_size_combo, s); + + uint32_t period = backend->buffer_size(); + if (0 == period) { + period = backend->default_buffer_size(device_name); + } + set_active_text_if_present (buffer_size_combo, bufsize_as_string (period)); + show_buffer_duration (); + } else { + buffer_size_combo.set_sensitive (false); + } +} + +void +EngineControl::device_changed () +{ boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); assert (backend); string device_name = device_combo.get_active_text (); - vector s; if (device_name != backend->device_name()) { /* we set the backend-device to query various device related intormation. @@ -940,86 +1182,70 @@ EngineControl::device_changed () recursive call to this method. */ - /* sample rates */ + set_samplerate_popdown_strings (device_name); + set_buffersize_popdown_strings (device_name); + /* XXX theoretically need to set min + max channel counts here + */ - string desired; + manage_control_app_sensitivity (); + } - vector sr; + /* pick up any saved state for this device */ - if (_have_control) { - sr = backend->available_sample_rates (device_name); - } else { + if (!ignore_changes) { + maybe_display_saved_state (); + } +} - sr.push_back (8000.0f); - sr.push_back (16000.0f); - sr.push_back (32000.0f); - sr.push_back (44100.0f); - sr.push_back (48000.0f); - sr.push_back (88200.0f); - sr.push_back (96000.0f); - sr.push_back (192000.0f); - sr.push_back (384000.0f); - } +void +EngineControl::input_device_changed () +{ + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + assert (backend); + string input_device_name = input_device_combo.get_active_text (); - for (vector::const_iterator x = sr.begin(); x != sr.end(); ++x) { - s.push_back (rate_as_string (*x)); - if (*x == _desired_sample_rate) { - desired = s.back(); - } - } + if (input_device_name != backend->input_device_name()) { + queue_device_changed = true; + } - if (!s.empty()) { - sample_rate_combo.set_sensitive (true); - set_popdown_strings (sample_rate_combo, s); + backend->set_input_device_name(input_device_name); - if (desired.empty()) { - sample_rate_combo.set_active_text (rate_as_string (backend->default_sample_rate())); - } else { - sample_rate_combo.set_active_text (desired); - } + { + PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); - } else { - sample_rate_combo.set_sensitive (false); - } + set_samplerate_popdown_strings (input_device_name); + set_buffersize_popdown_strings (input_device_name); + /* XXX theoretically need to set min + max channel counts here + */ - /* buffer sizes */ + manage_control_app_sensitivity (); + } - vector bs; + /* pick up any saved state for this device */ - if (_have_control) { - bs = backend->available_buffer_sizes (device_name); - } else if (backend->can_change_buffer_size_when_running()) { - bs.push_back (8); - bs.push_back (16); - bs.push_back (32); - bs.push_back (64); - bs.push_back (128); - bs.push_back (256); - bs.push_back (512); - bs.push_back (1024); - bs.push_back (2048); - bs.push_back (4096); - bs.push_back (8192); - } - s.clear (); - for (vector::const_iterator x = bs.begin(); x != bs.end(); ++x) { - s.push_back (bufsize_as_string (*x)); - } + if (!ignore_changes) { + maybe_display_saved_state (); + } +} - if (!s.empty()) { - buffer_size_combo.set_sensitive (true); - set_popdown_strings (buffer_size_combo, s); +void +EngineControl::output_device_changed () +{ + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + assert (backend); + string output_device_name = output_device_combo.get_active_text (); - uint32_t period = backend->buffer_size(); - if (0 == period) { - period = backend->default_buffer_size(device_name); - } - buffer_size_combo.set_active_text (bufsize_as_string (period)); - show_buffer_duration (); - } else { - buffer_size_combo.set_sensitive (false); - } + if (output_device_name != backend->output_device_name()) { + queue_device_changed = true; + } + + backend->set_output_device_name(output_device_name); + { + PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); + + set_samplerate_popdown_strings (output_device_name); + set_buffersize_popdown_strings (output_device_name); /* XXX theoretically need to set min + max channel counts here */ @@ -1039,8 +1265,8 @@ EngineControl::bufsize_as_string (uint32_t sz) /* Translators: "samples" is always plural here, so no need for plural+singular forms. */ - char buf[32]; - snprintf (buf, sizeof (buf), _("%u samples"), sz); + char buf[64]; + snprintf (buf, sizeof (buf), "%u %s", sz, P_("sample", "samples", sz)); return buf; } @@ -1052,9 +1278,6 @@ EngineControl::sample_rate_changed () */ show_buffer_duration (); - if (!ignore_changes) { - save_state (); - } } @@ -1062,9 +1285,6 @@ void EngineControl::buffer_size_changed () { show_buffer_duration (); - if (!ignore_changes) { - save_state (); - } } void @@ -1138,18 +1358,11 @@ EngineControl::midi_option_changed () } else { midi_devices_button.set_sensitive (true); } - - if (!ignore_changes) { - save_state (); - } } void EngineControl::parameter_changed () { - if (!ignore_changes) { - save_state (); - } } EngineControl::State @@ -1168,23 +1381,59 @@ EngineControl::get_matching_state ( return State(); } +EngineControl::State +EngineControl::get_matching_state ( + const string& backend, + const string& driver, + const string& input_device, + const string& output_device) +{ + for (StateList::iterator i = states.begin(); i != states.end(); ++i) { + if ((*i)->backend == backend && + (!_have_control || ((*i)->driver == driver && ((*i)->input_device == input_device) && (*i)->output_device == output_device))) + { + return (*i); + } + } + return State(); +} + EngineControl::State EngineControl::get_saved_state_for_currently_displayed_backend_and_device () { boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); if (backend) { - return get_matching_state (backend_combo.get_active_text(), - (backend->requires_driver_selection() ? (std::string) driver_combo.get_active_text() : string()), - device_combo.get_active_text()); + if (backend->use_separate_input_and_output_devices ()) { + return get_matching_state (backend_combo.get_active_text(), + (backend->requires_driver_selection() ? (std::string) driver_combo.get_active_text() : string()), + input_device_combo.get_active_text(), + output_device_combo.get_active_text()); + } else { + return get_matching_state (backend_combo.get_active_text(), + (backend->requires_driver_selection() ? (std::string) driver_combo.get_active_text() : string()), + device_combo.get_active_text()); + } } - return get_matching_state (backend_combo.get_active_text(), string(), device_combo.get_active_text()); } +bool EngineControl::equivalent_states (const EngineControl::State& state1, + const EngineControl::State& state2) +{ + if (state1->backend == state2->backend && + state1->driver == state2->driver && + state1->device == state2->device && + state1->input_device == state2->input_device && + state1->output_device == state2->output_device) { + return true; + } + return false; +} + EngineControl::State EngineControl::save_state () { @@ -1203,9 +1452,7 @@ EngineControl::save_state () } for (StateList::iterator i = states.begin(); i != states.end();) { - if ((*i)->backend == state->backend && - (*i)->driver == state->driver && - (*i)->device == state->device) { + if (equivalent_states (*i, state)) { i = states.erase(i); } else { ++i; @@ -1223,6 +1470,8 @@ EngineControl::store_state (State state) state->backend = get_backend (); state->driver = get_driver (); state->device = get_device_name (); + state->input_device = get_input_device_name (); + state->output_device = get_output_device_name (); state->sample_rate = get_rate (); state->buffer_size = get_buffer_size (); state->input_latency = get_input_latency (); @@ -1248,7 +1497,7 @@ EngineControl::maybe_display_saved_state () if (!_desired_sample_rate) { sample_rate_combo.set_active_text (rate_as_string (state->sample_rate)); } - buffer_size_combo.set_active_text (bufsize_as_string (state->buffer_size)); + set_active_text_if_present (buffer_size_combo, bufsize_as_string (state->buffer_size)); /* call this explicitly because we're ignoring changes to the controls at this point. */ @@ -1279,6 +1528,8 @@ EngineControl::get_state () node->add_property ("backend", (*i)->backend); node->add_property ("driver", (*i)->driver); node->add_property ("device", (*i)->device); + node->add_property ("input-device", (*i)->input_device); + node->add_property ("output-device", (*i)->output_device); node->add_property ("sample-rate", (*i)->sample_rate); node->add_property ("buffer-size", (*i)->buffer_size); node->add_property ("input-latency", (*i)->input_latency); @@ -1317,6 +1568,8 @@ EngineControl::set_state (const XMLNode& root) XMLNode* grandchild; XMLProperty* prop = NULL; + fprintf (stderr, "EngineControl::set_state\n"); + if (root.name() != "AudioMIDISetup") { return; } @@ -1359,6 +1612,16 @@ EngineControl::set_state (const XMLNode& root) } state->device = prop->value (); + if ((prop = grandchild->property ("input-device")) == 0) { + continue; + } + state->input_device = prop->value (); + + if ((prop = grandchild->property ("output-device")) == 0) { + continue; + } + state->output_device = prop->value (); + if ((prop = grandchild->property ("sample-rate")) == 0) { continue; } @@ -1461,16 +1724,19 @@ EngineControl::set_state (const XMLNode& root) for (StateList::const_iterator i = states.begin(); i != states.end(); ++i) { if ((*i)->active) { - ignore_changes++; + PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); backend_combo.set_active_text ((*i)->backend); driver_combo.set_active_text ((*i)->driver); device_combo.set_active_text ((*i)->device); + fprintf (stderr, "setting input device to: %s ", (*i)->input_device.c_str()); + input_device_combo.set_active_text ((*i)->input_device); + fprintf (stderr, "setting output device to: %s ", (*i)->output_device.c_str()); + output_device_combo.set_active_text ((*i)->output_device); sample_rate_combo.set_active_text (rate_as_string ((*i)->sample_rate)); - buffer_size_combo.set_active_text (bufsize_as_string ((*i)->buffer_size)); + set_active_text_if_present (buffer_size_combo, bufsize_as_string ((*i)->buffer_size)); input_latency.set_value ((*i)->input_latency); output_latency.set_value ((*i)->output_latency); midi_option_combo.set_active_text ((*i)->midi_option); - ignore_changes--; break; } } @@ -1512,7 +1778,20 @@ EngineControl::push_state_to_backend (bool start) } } - if (queue_device_changed || get_device_name() != backend->device_name()) { + if (backend->use_separate_input_and_output_devices()) { + if (get_input_device_name() != backend->input_device_name()) { + change_device = true; + } + if (get_output_device_name() != backend->output_device_name()) { + change_device = true; + } + } else { + if (get_device_name() != backend->device_name()) { + change_device = true; + } + } + + if (queue_device_changed) { change_device = true; } @@ -1662,9 +1941,20 @@ EngineControl::push_state_to_backend (bool start) error << string_compose (_("Cannot set driver to %1"), get_driver()) << endmsg; return -1; } - if (change_device && backend->set_device_name (get_device_name())) { - error << string_compose (_("Cannot set device name to %1"), get_device_name()) << endmsg; - return -1; + if (backend->use_separate_input_and_output_devices()) { + if (change_device && backend->set_input_device_name (get_input_device_name())) { + error << string_compose (_("Cannot set input device name to %1"), get_input_device_name()) << endmsg; + return -1; + } + if (change_device && backend->set_output_device_name (get_output_device_name())) { + error << string_compose (_("Cannot set output device name to %1"), get_output_device_name()) << endmsg; + return -1; + } + } else { + if (change_device && backend->set_device_name (get_device_name())) { + error << string_compose (_("Cannot set device name to %1"), get_device_name()) << endmsg; + return -1; + } } if (change_rate && backend->set_sample_rate (get_rate())) { error << string_compose (_("Cannot set sample rate to %1"), get_rate()) << endmsg; @@ -1741,6 +2031,8 @@ EngineControl::post_push () if (!state) { state = save_state (); assert (state); + } else { + store_state(state); } /* all off */ @@ -1785,6 +2077,8 @@ EngineControl::get_buffer_size () const uint32_t samples; if (sscanf (txt.c_str(), "%d", &samples) != 1) { + fprintf(stderr, "Find a trout and repeatedly slap the nearest C++ who throws exceptions without catching them.\n"); + fprintf(stderr, "Ardour will likely crash now, giving you time to get the trout.\n"); throw exception (); } @@ -1853,6 +2147,18 @@ EngineControl::get_device_name () const return device_combo.get_active_text (); } +string +EngineControl::get_input_device_name () const +{ + return input_device_combo.get_active_text (); +} + +string +EngineControl::get_output_device_name () const +{ + return output_device_combo.get_active_text (); +} + void EngineControl::control_app_button_clicked () { @@ -1888,6 +2194,8 @@ EngineControl::set_desired_sample_rate (uint32_t sr) { _desired_sample_rate = sr; device_changed (); + input_device_changed (); + output_device_changed (); } void @@ -2176,7 +2484,7 @@ EngineControl::engine_running () boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); assert (backend); - buffer_size_combo.set_active_text (bufsize_as_string (backend->buffer_size())); + set_active_text_if_present (buffer_size_combo, bufsize_as_string (backend->buffer_size())); sample_rate_combo.set_active_text (rate_as_string (backend->sample_rate())); buffer_size_combo.set_sensitive (true); @@ -2207,7 +2515,7 @@ EngineControl::engine_stopped () void EngineControl::device_list_changed () { - PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); + PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); // ?? list_devices (); midi_option_changed(); }