X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fengine_dialog.cc;h=980f72596b41c282d253b061c99669d5af9c8b61;hb=a3b2b1bcfae110c01d47b256e5a4e973a86d2f71;hp=3e1337e62a1b841e6dc0f7157ab4f3d3496361df;hpb=28730b4939774a7956411bfe3e28ae53f1c44008;p=ardour.git diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 3e1337e62a..980f72596b 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -48,6 +48,8 @@ #include "pbd/convert.h" #include "pbd/error.h" +#include "opts.h" +#include "debug.h" #include "ardour_ui.h" #include "engine_dialog.h" #include "gui_thread.h" @@ -61,6 +63,8 @@ using namespace PBD; using namespace Glib; using namespace ARDOUR_UI_UTILS; +#define DEBUG_ECONTROL(msg) DEBUG_TRACE (PBD::DEBUG::EngineControl, string_compose ("%1: %2\n", __LINE__, msg)); + static const unsigned int midi_tab = 2; static const unsigned int latency_tab = 1; /* zero-based, page zero is the main setup page */ @@ -94,6 +98,7 @@ EngineControl::EngineControl () , _desired_sample_rate (0) , started_at_least_once (false) , queue_device_changed (false) + , block_signals(0) { using namespace Notebook_Helpers; vector backend_names; @@ -118,7 +123,6 @@ EngineControl::EngineControl () } set_popdown_strings (backend_combo, backend_names); - backend_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::backend_changed)); /* setup basic packing characteristics for the table used on the main * tab of the notebook @@ -176,8 +180,6 @@ EngineControl::EngineControl () lm_table.attach (*misc_align, 1, 3, row, row+1, FILL, (AttachOptions) 0); ++row; - xopt = AttachOptions(0); - lm_measure_label.set_padding (10, 10); lm_measure_button.add (lm_measure_label); lm_measure_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::latency_button_clicked)); @@ -281,49 +283,116 @@ EngineControl::EngineControl () ARDOUR::AudioEngine::instance()->DeviceListChanged.connect (devicelist_connection, MISSING_INVALIDATOR, boost::bind (&EngineControl::device_list_changed, this), gui_context()); if (audio_setup) { - set_state (*audio_setup); - } - - 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()); + if (!set_state (*audio_setup)) { + set_default_state (); + } + } else { + set_default_state (); } - backend_changed (); + connect_changed_signals (); - /* in case the setting the backend failed, e.g. stale config, from set_state(), try again */ - if (0 == ARDOUR::AudioEngine::instance()->current_backend()) { - backend_combo.set_active_text (backend_names.back()); - /* ignore: don't save state */ - PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); - backend_changed (); - } + notebook.signal_switch_page().connect (sigc::mem_fun (*this, &EngineControl::on_switch_page)); + connect_disconnect_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::connect_disconnect_click)); + connect_disconnect_button.set_no_show_all(); - /* Connect to signals */ +} - driver_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::driver_changed)); - sample_rate_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::sample_rate_changed)); - buffer_size_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::buffer_size_changed)); - 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)); +void +EngineControl::connect_changed_signals () +{ + backend_combo_connection = backend_combo.signal_changed ().connect ( + sigc::mem_fun (*this, &EngineControl::backend_changed)); + driver_combo_connection = driver_combo.signal_changed ().connect ( + sigc::mem_fun (*this, &EngineControl::driver_changed)); + sample_rate_combo_connection = sample_rate_combo.signal_changed ().connect ( + sigc::mem_fun (*this, &EngineControl::sample_rate_changed)); + buffer_size_combo_connection = buffer_size_combo.signal_changed ().connect ( + sigc::mem_fun (*this, &EngineControl::buffer_size_changed)); + device_combo_connection = device_combo.signal_changed ().connect ( + sigc::mem_fun (*this, &EngineControl::device_changed)); + midi_option_combo_connection = midi_option_combo.signal_changed ().connect ( + sigc::mem_fun (*this, &EngineControl::midi_option_changed)); + + input_device_combo_connection = input_device_combo.signal_changed ().connect ( + sigc::mem_fun (*this, &EngineControl::input_device_changed)); + output_device_combo_connection = output_device_combo.signal_changed ().connect ( + sigc::mem_fun (*this, &EngineControl::output_device_changed)); + + input_latency_connection = input_latency.signal_changed ().connect ( + sigc::mem_fun (*this, &EngineControl::parameter_changed)); + output_latency_connection = output_latency.signal_changed ().connect ( + sigc::mem_fun (*this, &EngineControl::parameter_changed)); + input_channels_connection = input_channels.signal_changed ().connect ( + sigc::mem_fun (*this, &EngineControl::parameter_changed)); + output_channels_connection = output_channels.signal_changed ().connect ( + sigc::mem_fun (*this, &EngineControl::parameter_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)); - output_channels.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed)); +void +EngineControl::block_changed_signals () +{ + if (block_signals++ == 0) { + DEBUG_ECONTROL ("Blocking changed signals"); + backend_combo_connection.block (); + driver_combo_connection.block (); + sample_rate_combo_connection.block (); + buffer_size_combo_connection.block (); + device_combo_connection.block (); + input_device_combo_connection.block (); + output_device_combo_connection.block (); + midi_option_combo_connection.block (); + input_latency_connection.block (); + output_latency_connection.block (); + input_channels_connection.block (); + output_channels_connection.block (); + } +} - notebook.signal_switch_page().connect (sigc::mem_fun (*this, &EngineControl::on_switch_page)); +void +EngineControl::unblock_changed_signals () +{ + if (--block_signals == 0) { + DEBUG_ECONTROL ("Unblocking changed signals"); + backend_combo_connection.unblock (); + driver_combo_connection.unblock (); + sample_rate_combo_connection.unblock (); + buffer_size_combo_connection.unblock (); + device_combo_connection.unblock (); + input_device_combo_connection.unblock (); + output_device_combo_connection.unblock (); + midi_option_combo_connection.unblock (); + input_latency_connection.unblock (); + output_latency_connection.unblock (); + input_channels_connection.unblock (); + output_channels_connection.unblock (); + } +} - connect_disconnect_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::connect_disconnect_click)); - connect_disconnect_button.set_no_show_all(); +EngineControl::SignalBlocker::SignalBlocker (EngineControl& engine_control, + const std::string& reason) + : ec (engine_control) + , m_reason (reason) +{ + DEBUG_ECONTROL (string_compose ("SignalBlocker: %1", m_reason)); + ec.block_changed_signals (); +} +EngineControl::SignalBlocker::~SignalBlocker () +{ + DEBUG_ECONTROL (string_compose ("~SignalBlocker: %1", m_reason)); + ec.unblock_changed_signals (); } 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 (); ok_button->grab_focus(); } @@ -338,9 +407,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; @@ -412,10 +500,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); @@ -508,7 +612,7 @@ EngineControl::build_no_control_notebook () vector strings; AttachOptions xopt = AttachOptions (FILL|EXPAND); int row = 1; // row zero == backend combo - const string msg = string_compose (_("The %1 audio backend was configured and started externally.\nThis limits your control over it."), backend->name()); + const string msg = string_compose (_("%1 is already running. %2 will connect to it and use the existing settings."), backend->name(), PROGRAM_NAME); label = manage (new Label); label->set_markup (string_compose ("%1", msg)); @@ -706,14 +810,10 @@ EngineControl::refresh_midi_display (std::string focus) } } -void -EngineControl::update_sensitivity () -{ -} - void EngineControl::backend_changed () { + SignalBlocker blocker (*this, "backend_changed"); string backend_name = backend_combo.get_active_text(); boost::shared_ptr backend; @@ -723,6 +823,8 @@ EngineControl::backend_changed () return; } + DEBUG_ECONTROL (string_compose ("Backend name: %1", backend_name)); + _have_control = ARDOUR::AudioEngine::instance()->setup_required (); build_notebook (); @@ -730,27 +832,8 @@ EngineControl::backend_changed () _midi_devices.clear(); if (backend->requires_driver_selection()) { - vector drivers = backend->enumerate_drivers(); - driver_combo.set_sensitive (true); - - if (!drivers.empty()) { - { - string current_driver; - current_driver = backend->driver_name (); - - // driver might not have been set yet - if (current_driver == "") { - current_driver = driver_combo.get_active_text (); - if (current_driver == "") - // driver has never been set, make sure it's not blank - current_driver = drivers.front (); - } - - PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); - set_popdown_strings (driver_combo, drivers); - driver_combo.set_active_text (current_driver); - } - + if (set_driver_popdown_strings ()) { + driver_combo.set_sensitive (true); driver_changed (); } @@ -762,6 +845,23 @@ EngineControl::backend_changed () list_devices (); } + update_midi_options (); + + connect_disconnect_button.hide(); + + midi_option_changed(); + + started_at_least_once = false; + + if (!ignore_changes) { + maybe_display_saved_state (); + } +} + +void +EngineControl::update_midi_options () +{ + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); vector midi_options = backend->enumerate_midi_options(); if (midi_options.size() == 1) { @@ -776,16 +876,6 @@ EngineControl::backend_changed () midi_option_combo.set_sensitive (false); } } - - connect_disconnect_button.hide(); - - midi_option_changed(); - - started_at_least_once = false; - - if (!ignore_changes) { - maybe_display_saved_state (); - } } bool @@ -806,14 +896,42 @@ EngineControl::print_channel_count (Gtk::SpinButton* sb) return true; } -void -EngineControl::list_devices () +// @return true if there are drivers available +bool +EngineControl::set_driver_popdown_strings () { + DEBUG_ECONTROL ("set_driver_popdown_strings"); boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); - assert (backend); + vector drivers = backend->enumerate_drivers(); - /* now fill out devices, mark sample rates, buffer sizes insensitive */ + if (drivers.empty ()) { + // This is an error...? + return false; + } + + string current_driver = backend->driver_name (); + + DEBUG_ECONTROL (string_compose ("backend->driver_name: %1", current_driver)); + + if (std::find (drivers.begin (), drivers.end (), current_driver) == + drivers.end ()) { + current_driver = drivers.front (); + } + + set_popdown_strings (driver_combo, drivers); + DEBUG_ECONTROL ( + string_compose ("driver_combo.set_active_text: %1", current_driver)); + driver_combo.set_active_text (current_driver); + return true; +} + +// @return true if there are devices available +bool +EngineControl::set_device_popdown_strings () +{ + DEBUG_ECONTROL ("set_device_popdown_strings"); + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); vector all_devices = backend->enumerate_devices (); /* NOTE: Ardour currently does not display the "available" field of the @@ -831,34 +949,126 @@ EngineControl::list_devices () available_devices.push_back (i->name); } - if (!available_devices.empty()) { + if (available_devices.empty ()) { + return false; + } - update_sensitivity (); + string current_device = backend->device_name (); - { - string current_device, found_device; - current_device = device_combo.get_active_text (); - if (current_device == "") { - current_device = backend->device_name (); - } + // Make sure that backend->device_name () is a valid + // device, the backend may not return a valid device if it hasn't + // been set yet. + if (std::find (available_devices.begin (), + available_devices.end (), + current_device) == available_devices.end ()) { - // 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 (); + current_device = available_devices.front (); + } - PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); - set_popdown_strings (device_combo, available_devices); + set_popdown_strings (device_combo, available_devices); + DEBUG_ECONTROL ( + string_compose ("set device_combo active text: %1", current_device)); - device_combo.set_active_text (current_device); - } + device_combo.set_active_text (current_device); + return true; +} + +// @return true if there are input devices available +bool +EngineControl::set_input_device_popdown_strings () +{ + DEBUG_ECONTROL ("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()) { + return false; + } + + string current_device = backend->input_device_name (); + + // Make sure that backend->input_device_name () is a valid + // device, the backend may not return a valid device if it hasn't + // been set yet. + if (std::find (available_devices.begin (), + available_devices.end (), + current_device) == available_devices.end ()) { + + current_device = available_devices.front (); + } + + set_popdown_strings (input_device_combo, available_devices); + + DEBUG_ECONTROL ( + string_compose ("set input_device_combo active text: %1", current_device)); + input_device_combo.set_active_text (current_device); + return true; +} + +// @return true if there are output devices available +bool +EngineControl::set_output_device_popdown_strings () +{ + DEBUG_ECONTROL ("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()) { + return false; + } + + string current_device = backend->output_device_name (); + + // Make sure that backend->output_device_name () is a valid + // device, the backend may not return a valid device if it hasn't + // been set yet. + if (std::find (available_devices.begin (), + available_devices.end (), + current_device) == available_devices.end ()) { + + current_device = available_devices.front (); + } + + set_popdown_strings (output_device_combo, available_devices); + + DEBUG_ECONTROL ( + string_compose ("set output_device_combo active text: %1", current_device)); + output_device_combo.set_active_text (current_device); + return true; +} + +void +EngineControl::list_devices () +{ + DEBUG_ECONTROL ("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) { device_changed (); input_latency.set_sensitive (true); @@ -871,6 +1081,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); @@ -897,6 +1109,7 @@ EngineControl::list_devices () void EngineControl::driver_changed () { + SignalBlocker blocker (*this, "driver_changed"); boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); assert (backend); @@ -908,114 +1121,212 @@ EngineControl::driver_changed () } } -void -EngineControl::device_changed () +vector +EngineControl::get_sample_rates_for_all_devices () { + boost::shared_ptr backend = + ARDOUR::AudioEngine::instance ()->current_backend (); + vector all_rates; + if (backend->use_separate_input_and_output_devices ()) { + all_rates = backend->available_sample_rates (get_input_device_name (), get_output_device_name ()); + } else { + all_rates = backend->available_sample_rates (get_device_name ()); + } + return all_rates; +} + +vector +EngineControl::get_default_sample_rates () +{ + vector rates; + rates.push_back (8000.0f); + rates.push_back (16000.0f); + rates.push_back (32000.0f); + rates.push_back (44100.0f); + rates.push_back (48000.0f); + rates.push_back (88200.0f); + rates.push_back (96000.0f); + rates.push_back (192000.0f); + rates.push_back (384000.0f); + return rates; +} + +void +EngineControl::set_samplerate_popdown_strings () +{ + DEBUG_ECONTROL ("set_samplerate_popdown_strings"); boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); - assert (backend); - string device_name = device_combo.get_active_text (); + string desired; + vector sr; vector s; - if (device_name != backend->device_name()) { - /* we set the backend-device to query various device related intormation. - * This has the side effect that backend->device_name() will match - * the device_name and 'change_device' will never be true. - * so work around this by setting... - */ - queue_device_changed = true; + if (_have_control) { + sr = get_sample_rates_for_all_devices (); + // currently possible if both devices are set to "None" and the backend + // returns no supported rates for both devices + if (sr.empty()) { + sr = get_default_sample_rates (); + } + } else { + sr = get_default_sample_rates (); } - - //the device name must be set FIRST so ASIO can populate buffersizes and the control panel button - backend->set_device_name(device_name); - - { - PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); - /* don't allow programmatic change to combos to cause a - recursive call to this method. - */ + 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(); + } + } - /* sample rates */ + if (!s.empty()) { + sample_rate_combo.set_sensitive (true); + set_popdown_strings (sample_rate_combo, s); - string desired; + if (desired.empty ()) { + float new_active_sr = backend->default_sample_rate (); - vector sr; + if (std::find (sr.begin (), sr.end (), new_active_sr) == sr.end ()) { + new_active_sr = sr.front (); + } - if (_have_control) { - sr = backend->available_sample_rates (device_name); + sample_rate_combo.set_active_text (rate_as_string (new_active_sr)); } 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); + sample_rate_combo.set_active_text (desired); } - 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(); - } - } + } else { + sample_rate_combo.set_sensitive (false); + } +} + +vector +EngineControl::get_buffer_sizes_for_all_devices () +{ + boost::shared_ptr backend = + ARDOUR::AudioEngine::instance ()->current_backend (); + vector all_sizes; - if (!s.empty()) { - sample_rate_combo.set_sensitive (true); - set_popdown_strings (sample_rate_combo, s); + if (backend->use_separate_input_and_output_devices ()) { + all_sizes = backend->available_buffer_sizes (get_input_device_name (), get_output_device_name ()); + } else { + all_sizes = backend->available_buffer_sizes (get_device_name ()); + } + return all_sizes; +} - if (desired.empty()) { - sample_rate_combo.set_active_text (rate_as_string (backend->default_sample_rate())); - } else { - sample_rate_combo.set_active_text (desired); - } +vector +EngineControl::get_default_buffer_sizes () +{ + vector sizes; + sizes.push_back (8); + sizes.push_back (16); + sizes.push_back (32); + sizes.push_back (64); + sizes.push_back (128); + sizes.push_back (256); + sizes.push_back (512); + sizes.push_back (1024); + sizes.push_back (2048); + sizes.push_back (4096); + sizes.push_back (8192); + return sizes; +} - } else { - sample_rate_combo.set_sensitive (false); +void +EngineControl::set_buffersize_popdown_strings () +{ + DEBUG_ECONTROL ("set_buffersize_popdown_strings"); + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + vector bs; + vector s; + string device_name; + + if (_have_control) { + bs = get_buffer_sizes_for_all_devices (); + // currently possible if both devices are set to "None" and the backend + // returns no supported sizes for both devices + if (bs.empty()) { + bs = get_default_buffer_sizes (); } + } else if (backend->can_change_buffer_size_when_running()) { + bs = get_default_buffer_sizes (); + } - /* buffer sizes */ + for (vector::const_iterator x = bs.begin(); x != bs.end(); ++x) { + s.push_back (bufsize_as_string (*x)); + } - vector bs; + if (backend->use_separate_input_and_output_devices ()) { + device_name = get_input_device_name (); + } else { + device_name = get_device_name (); + } - 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); + buffer_size_combo.set_active_text (s.front()); + + 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 () +{ + SignalBlocker blocker (*this, "device_changed"); + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + assert (backend); - if (!s.empty()) { - buffer_size_combo.set_sensitive (true); - set_popdown_strings (buffer_size_combo, s); + string device_name_in; + string device_name_out; // only used if backend support separate I/O devices - 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); + if (backend->use_separate_input_and_output_devices()) { + device_name_in = get_input_device_name (); + device_name_out = get_output_device_name (); + } else { + device_name_in = get_device_name (); + } + + /* we set the backend-device to query various device related intormation. + * This has the side effect that backend->device_name() will match + * the device_name and 'change_device' will never be true. + * so work around this by setting... + */ + if (backend->use_separate_input_and_output_devices()) { + if (device_name_in != backend->input_device_name() || device_name_out != backend->output_device_name ()) { + queue_device_changed = true; + } + } else { + if (device_name_in != backend->device_name()) { + queue_device_changed = true; } + } + + //the device name must be set FIRST so ASIO can populate buffersizes and the control panel button + if (backend->use_separate_input_and_output_devices()) { + backend->set_input_device_name (device_name_in); + backend->set_output_device_name (device_name_out); + } else { + backend->set_device_name(device_name_in); + } + { + /* don't allow programmatic change to combos to cause a + recursive call to this method. + */ + PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); + + set_samplerate_popdown_strings (); + set_buffersize_popdown_strings (); /* XXX theoretically need to set min + max channel counts here */ @@ -1029,6 +1340,20 @@ EngineControl::device_changed () } } +void +EngineControl::input_device_changed () +{ + DEBUG_ECONTROL ("input_device_changed"); + device_changed (); +} + +void +EngineControl::output_device_changed () +{ + DEBUG_ECONTROL ("output_device_changed"); + device_changed (); +} + string EngineControl::bufsize_as_string (uint32_t sz) { @@ -1043,6 +1368,7 @@ EngineControl::bufsize_as_string (uint32_t sz) void EngineControl::sample_rate_changed () { + DEBUG_ECONTROL ("sample_rate_changed"); /* reset the strings for buffer size to show the correct msec value (reflecting the new sample rate). */ @@ -1054,13 +1380,14 @@ EngineControl::sample_rate_changed () void EngineControl::buffer_size_changed () { + DEBUG_ECONTROL ("buffer_size_changed"); show_buffer_duration (); } void EngineControl::show_buffer_duration () { - + DEBUG_ECONTROL ("show_buffer_duration"); /* buffer sizes - convert from just samples to samples + msecs for * the displayed string */ @@ -1094,6 +1421,7 @@ EngineControl::show_buffer_duration () void EngineControl::midi_option_changed () { + DEBUG_ECONTROL ("midi_option_changed"); boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); assert (backend); @@ -1151,23 +1479,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 () { @@ -1186,9 +1550,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; @@ -1206,6 +1568,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 (); @@ -1249,6 +1613,8 @@ EngineControl::maybe_display_saved_state () XMLNode& EngineControl::get_state () { + LocaleGuard lg (X_("C")); + XMLNode* root = new XMLNode ("AudioMIDISetup"); std::string path; @@ -1262,6 +1628,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); @@ -1292,6 +1660,22 @@ EngineControl::get_state () } void +EngineControl::set_default_state () +{ + vector backend_names; + vector backends = ARDOUR::AudioEngine::instance()->available_backends(); + + for (vector::const_iterator b = backends.begin(); b != backends.end(); ++b) { + backend_names.push_back ((*b)->name); + } + backend_combo.set_active_text (backend_names.front()); + + // We could set default backends per platform etc here + + backend_changed (); +} + +bool EngineControl::set_state (const XMLNode& root) { XMLNodeList clist, cclist; @@ -1300,8 +1684,10 @@ EngineControl::set_state (const XMLNode& root) XMLNode* grandchild; XMLProperty* prop = NULL; + fprintf (stderr, "EngineControl::set_state\n"); + if (root.name() != "AudioMIDISetup") { - return; + return false; } clist = root.children(); @@ -1342,6 +1728,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; } @@ -1444,23 +1840,105 @@ EngineControl::set_state (const XMLNode& root) for (StateList::const_iterator i = states.begin(); i != states.end(); ++i) { if ((*i)->active) { - 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); - sample_rate_combo.set_active_text (rate_as_string ((*i)->sample_rate)); - 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); - break; + return set_current_state (*i); } } + return false; +} + +bool +EngineControl::set_current_state (const State& state) +{ + DEBUG_ECONTROL ("set_current_state"); + + boost::shared_ptr backend; + + if (!(backend = ARDOUR::AudioEngine::instance ()->set_backend ( + state->backend, "ardour", ""))) { + DEBUG_ECONTROL (string_compose ("Unable to set backend to %1", state->backend)); + // this shouldn't happen as the invalid backend names should have been + // removed from the list of states. + return false; + } + + // now reflect the change in the backend in the GUI so backend_changed will + // do the right thing + backend_combo.set_active_text (state->backend); + + if (!state->driver.empty ()) { + if (!backend->requires_driver_selection ()) { + DEBUG_ECONTROL ("Backend should require driver selection"); + // A backend has changed from having driver selection to not having + // it or someone has been manually editing a config file and messed + // it up + return false; + } + + if (backend->set_driver (state->driver) != 0) { + DEBUG_ECONTROL (string_compose ("Unable to set driver %1", state->driver)); + // Driver names for a backend have changed and the name in the + // config file is now invalid or support for driver is no longer + // included in the backend + return false; + } + // no need to set the driver_combo as backend_changed will use + // backend->driver_name to set the active driver + } + + if (!state->device.empty ()) { + if (backend->set_device_name (state->device) != 0) { + DEBUG_ECONTROL ( + string_compose ("Unable to set device name %1", state->device)); + // device is no longer available on the system + return false; + } + // no need to set active device as it will be picked up in + // via backend_changed ()/set_device_popdown_strings + + } else { + // backend supports separate input/output devices + if (backend->set_input_device_name (state->input_device) != 0) { + DEBUG_ECONTROL (string_compose ("Unable to set input device name %1", + state->input_device)); + // input device is no longer available on the system + return false; + } + + if (backend->set_output_device_name (state->output_device) != 0) { + DEBUG_ECONTROL (string_compose ("Unable to set output device name %1", + state->input_device)); + // output device is no longer available on the system + return false; + } + // no need to set active devices as it will be picked up in via + // backend_changed ()/set_*_device_popdown_strings + } + + backend_changed (); + + // Now restore the state of the rest of the controls + + // We don't use a SignalBlocker as set_current_state is currently only + // called from set_state before any signals are connected. If at some point + // a more general named state mechanism is implemented and + // set_current_state is called while signals are connected then a + // SignalBlocker will need to be instantiated before setting these. + + device_combo.set_active_text (state->device); + input_device_combo.set_active_text (state->input_device); + output_device_combo.set_active_text (state->output_device); + sample_rate_combo.set_active_text (rate_as_string (state->sample_rate)); + set_active_text_if_present (buffer_size_combo, bufsize_as_string (state->buffer_size)); + input_latency.set_value (state->input_latency); + output_latency.set_value (state->output_latency); + midi_option_combo.set_active_text (state->midi_option); + return true; } int EngineControl::push_state_to_backend (bool start) { + DEBUG_ECONTROL ("push_state_to_backend"); boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); if (!backend) { @@ -1494,7 +1972,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; } @@ -1644,9 +2135,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; @@ -1839,6 +2341,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 () {