X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fengine_dialog.cc;h=e6c787359fab728278b555bb443cf75fe28d75e9;hb=c734f82ff224c6316c20d9c936895fbd35f8e43c;hp=35876d5c37d36de5663317bfd357a3ced76b9106;hpb=d2cbb28f79860889c0e0e7800b2d37a1fe12ccfb;p=ardour.git diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 35876d5c37..e6c787359f 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -43,10 +43,13 @@ #include "ardour/mididm.h" #include "ardour/rc_configuration.h" #include "ardour/types.h" +#include "ardour/profile.h" #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" @@ -60,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 */ @@ -67,6 +72,7 @@ static const char* results_markup = X_("%1 EngineControl::EngineControl () : ArdourDialog (_("Audio/MIDI Setup")) + , engine_status ("") , basic_packer (9, 4) , input_latency_adjustment (0, 0, 99999, 1) , input_latency (input_latency_adjustment) @@ -80,6 +86,7 @@ EngineControl::EngineControl () , ports_spinner (ports_adjustment) , control_app_button (_("Device Control Panel")) , midi_devices_button (_("Midi Device Setup")) + , stop_engine_button (_("Stop (Reconfigure)")) , lm_measure_label (_("Measure")) , lm_use_button (_("Use results")) , lm_back_button (_("Back to settings ... (ignore results)")) @@ -91,9 +98,11 @@ EngineControl::EngineControl () , ignore_changes (0) , _desired_sample_rate (0) , started_at_least_once (false) + , queue_device_changed (false) + , block_signals(0) { using namespace Notebook_Helpers; - vector strings; + vector backend_names; Label* label; AttachOptions xopt = AttachOptions (FILL|EXPAND); int row; @@ -111,12 +120,10 @@ EngineControl::EngineControl () } for (vector::const_iterator b = backends.begin(); b != backends.end(); ++b) { - strings.push_back ((*b)->name); + backend_names.push_back ((*b)->name); } - set_popdown_strings (backend_combo, strings); - backend_combo.set_active_text (strings.front()); - backend_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::backend_changed)); + set_popdown_strings (backend_combo, backend_names); /* setup basic packing characteristics for the table used on the main * tab of the notebook @@ -174,8 +181,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)); @@ -259,12 +264,19 @@ EngineControl::EngineControl () midi_devices_button.set_name ("generic button"); midi_devices_button.set_can_focus(true); - control_app_button.signal_clicked().connect (mem_fun (*this, &EngineControl::control_app_button_clicked)); + control_app_button.signal_clicked.connect (mem_fun (*this, &EngineControl::control_app_button_clicked)); + control_app_button.set_name ("generic button"); + control_app_button.set_can_focus(true); manage_control_app_sensitivity (); - cancel_button = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - ok_button = add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK); + stop_engine_button.signal_clicked.connect (mem_fun (*this, &EngineControl::stop_engine_button_clicked)); + stop_engine_button.set_sensitive (false); + stop_engine_button.set_name ("generic button"); + stop_engine_button.set_can_focus(true); + + cancel_button = add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_CANCEL); apply_button = add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_APPLY); + ok_button = add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK); /* Pick up any existing audio setup configuration, if appropriate */ @@ -273,29 +285,17 @@ EngineControl::EngineControl () ARDOUR::AudioEngine::instance()->Running.connect (running_connection, MISSING_INVALIDATOR, boost::bind (&EngineControl::engine_running, this), gui_context()); ARDOUR::AudioEngine::instance()->Stopped.connect (stopped_connection, MISSING_INVALIDATOR, boost::bind (&EngineControl::engine_stopped, this), gui_context()); ARDOUR::AudioEngine::instance()->Halted.connect (stopped_connection, MISSING_INVALIDATOR, boost::bind (&EngineControl::engine_stopped, this), gui_context()); + 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); - } - { - /* ignore: don't save state */ - PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); - backend_changed (); + if (audio_setup) { + if (!set_state (*audio_setup)) { + set_default_state (); + } + } else { + set_default_state (); } - /* 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)); - - 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)); + connect_changed_signals (); notebook.signal_switch_page().connect (sigc::mem_fun (*this, &EngineControl::on_switch_page)); @@ -304,10 +304,100 @@ EngineControl::EngineControl () } +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)); +} + +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 (); + } +} + +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 (); + } +} + +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(); } @@ -322,9 +412,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; @@ -357,6 +466,11 @@ EngineControl::build_notebook () basic_packer.attach (*label, 0, 1, 0, 1, xopt, (AttachOptions) 0); basic_packer.attach (backend_combo, 1, 2, 0, 1, xopt, (AttachOptions) 0); + basic_packer.attach (engine_status, 2, 3, 0, 1, xopt, (AttachOptions) 0); + engine_status.show(); + + basic_packer.attach (stop_engine_button, 3, 4, 0, 1, xopt, xopt); + lm_button_audio.signal_clicked.connect (sigc::mem_fun (*this, &EngineControl::calibrate_audio_latency)); lm_button_audio.set_name ("generic button"); lm_button_audio.set_can_focus(true); @@ -369,15 +483,6 @@ EngineControl::build_notebook () basic_vbox.pack_start (basic_hbox, false, false); - if (_have_control) { - Gtk::HBox* hpacker = manage (new HBox); - hpacker->set_border_width (12); - hpacker->pack_start (control_app_button, false, false); - hpacker->show (); - control_app_button.show(); - basic_vbox.pack_start (*hpacker); - } - { PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); basic_vbox.show_all (); @@ -405,10 +510,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); @@ -421,6 +542,10 @@ EngineControl::build_full_control_notebook () basic_packer.attach (buffer_size_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0); buffer_size_duration_label.set_alignment (0.0); /* left-align */ basic_packer.attach (buffer_size_duration_label, 2, 3, row, row+1, SHRINK, (AttachOptions) 0); + + /* button spans 2 rows */ + + basic_packer.attach (control_app_button, 3, 4, row-1, row+1, xopt, xopt); row++; input_channels.set_name ("InputChannels"); @@ -429,22 +554,26 @@ EngineControl::build_full_control_notebook () input_channels.set_wrap (false); output_channels.set_editable (true); - label = manage (left_aligned_label (_("Input Channels:"))); - basic_packer.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0); - basic_packer.attach (input_channels, 1, 2, row, row+1, xopt, (AttachOptions) 0); - ++row; - + if (!ARDOUR::Profile->get_mixbus()) { + label = manage (left_aligned_label (_("Input Channels:"))); + basic_packer.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0); + basic_packer.attach (input_channels, 1, 2, row, row+1, xopt, (AttachOptions) 0); + ++row; + } + output_channels.set_name ("OutputChannels"); output_channels.set_flags (Gtk::CAN_FOCUS); output_channels.set_digits (0); output_channels.set_wrap (false); output_channels.set_editable (true); - label = manage (left_aligned_label (_("Output Channels:"))); - basic_packer.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0); - basic_packer.attach (output_channels, 1, 2, row, row+1, xopt, (AttachOptions) 0); - ++row; - + if (!ARDOUR::Profile->get_mixbus()) { + label = manage (left_aligned_label (_("Output Channels:"))); + basic_packer.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0); + basic_packer.attach (output_channels, 1, 2, row, row+1, xopt, (AttachOptions) 0); + ++row; + } + input_latency.set_name ("InputLatency"); input_latency.set_flags (Gtk::CAN_FOCUS); input_latency.set_digits (0); @@ -475,10 +604,16 @@ 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); +#if ! defined __APPLE__ && ! defined PLATFORM_WINDOWS // => linux, YAY + /* Currently the only backend with dedicated Midi setup is ALSA. + * lot of people complain that this is greyed out + * "I can't use MIDI, the setup is greyed out" + */ basic_packer.attach (midi_devices_button, 3, 4, row, row+1, xopt, xopt); +#endif row++; } @@ -493,7 +628,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)); @@ -597,6 +732,105 @@ EngineControl::setup_midi_tab_for_backend () midi_vbox.show_all (); } +void +EngineControl::update_sensitivity () +{ + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + if (!backend) { + ok_button->set_sensitive (false); + apply_button->set_sensitive (false); + stop_engine_button.set_sensitive (false); + return; + } + + bool valid = true; + size_t devices_available = 0; + + if (backend->use_separate_input_and_output_devices ()) { + devices_available += get_popdown_string_count (input_device_combo); + devices_available += get_popdown_string_count (output_device_combo); + } else { + devices_available += get_popdown_string_count (device_combo); + } + + if (devices_available == 0) { + valid = false; + input_latency.set_sensitive (false); + output_latency.set_sensitive (false); + input_channels.set_sensitive (false); + output_channels.set_sensitive (false); + } else { + input_latency.set_sensitive (true); + output_latency.set_sensitive (true); + input_channels.set_sensitive (true); + output_channels.set_sensitive (true); + } + + if (get_popdown_string_count (buffer_size_combo) > 0) { + if (!ARDOUR::AudioEngine::instance()->running()) { + buffer_size_combo.set_sensitive (valid); + } else if (backend->can_change_sample_rate_when_running()) { + buffer_size_combo.set_sensitive (valid || !_have_control); + } else { +#if 1 + /* TODO + * Currently there is no way to manually stop the + * engine in order to re-configure it. + * This needs to remain sensitive for now. + * + * (it's also handy to implicily + * re-start the engine) + */ + buffer_size_combo.set_sensitive (true); +#else + buffer_size_combo.set_sensitive (false); +#endif + } + } else { + buffer_size_combo.set_sensitive (false); + valid = false; + } + + if (get_popdown_string_count (sample_rate_combo) > 0) { + if (!ARDOUR::AudioEngine::instance()->running()) { + sample_rate_combo.set_sensitive (true); + } else { + sample_rate_combo.set_sensitive (false); + } + } else { + sample_rate_combo.set_sensitive (false); + valid = false; + } + + if (ARDOUR::AudioEngine::instance()->running() && _have_control) { + input_device_combo.set_sensitive (false); + output_device_combo.set_sensitive (false); + device_combo.set_sensitive (false); + driver_combo.set_sensitive (false); + stop_engine_button.set_sensitive (true); + stop_engine_button.show (); + } else { + input_device_combo.set_sensitive (true); + output_device_combo.set_sensitive (true); + device_combo.set_sensitive (true); + if (backend->requires_driver_selection() && get_popdown_string_count(driver_combo) > 0) { + driver_combo.set_sensitive (true); + } else { + driver_combo.set_sensitive (false); + } + stop_engine_button.set_sensitive (false); + stop_engine_button.hide (); + } + + if (valid || !_have_control) { + ok_button->set_sensitive (true); + apply_button->set_sensitive (true); + } else { + ok_button->set_sensitive (false); + apply_button->set_sensitive (false); + } +} + void EngineControl::setup_midi_tab_for_jack () { @@ -691,22 +925,21 @@ 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; - if (!(backend = ARDOUR::AudioEngine::instance()->set_backend (backend_name, "ardour", ""))) { + if (!(backend = ARDOUR::AudioEngine::instance()->set_backend (backend_name, downcase (PROGRAM_NAME), ""))) { /* eh? setting the backend failed... how ? */ + /* A: stale config contains a backend that does not exist in current build */ return; } + DEBUG_ECONTROL (string_compose ("Backend name: %1", backend_name)); + _have_control = ARDOUR::AudioEngine::instance()->setup_required (); build_notebook (); @@ -714,38 +947,39 @@ 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_changed (); } - } else { - driver_combo.set_sensitive (false); /* this will change the device text which will cause a call to * device changed which will set up parameters */ list_devices (); } + update_midi_options (); + + connect_disconnect_button.hide(); + + midi_option_changed(); + + started_at_least_once = false; + + /* changing the backend implies stopping the engine + * ARDOUR::AudioEngine() may or may not emit this signal + * depending on previous engine state + */ + engine_stopped (); // set "active/inactive" + + 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) { @@ -760,21 +994,15 @@ 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 EngineControl::print_channel_count (Gtk::SpinButton* sb) { + if (ARDOUR::Profile->get_mixbus()) { + return true; + } + uint32_t cnt = (uint32_t) sb->get_value(); if (cnt == 0) { sb->set_text (_("all available channels")); @@ -786,14 +1014,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 @@ -811,65 +1067,139 @@ 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; - current_device = backend->device_name (); - if (current_device == "") { - // device might not have been set yet - current_device = device_combo.get_active_text (); - if (current_device == "") - // device has never been set, make sure it's not blank - current_device = available_devices.front (); - } + // 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 ()) { - PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); - set_popdown_strings (device_combo, available_devices); + current_device = available_devices.front (); + } - device_combo.set_active_text (current_device); - } + set_popdown_strings (device_combo, available_devices); + DEBUG_ECONTROL ( + string_compose ("set device_combo active text: %1", current_device)); - device_changed (); + device_combo.set_active_text (current_device); + return true; +} - input_latency.set_sensitive (true); - output_latency.set_sensitive (true); - input_channels.set_sensitive (true); - output_channels.set_sensitive (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 (); - ok_button->set_sensitive (true); - apply_button->set_sensitive (true); + 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 { - device_combo.clear(); - sample_rate_combo.set_sensitive (false); - buffer_size_combo.set_sensitive (false); - input_latency.set_sensitive (false); - output_latency.set_sensitive (false); - input_channels.set_sensitive (false); - output_channels.set_sensitive (false); - if (_have_control) { - ok_button->set_sensitive (false); - apply_button->set_sensitive (false); - } else { - ok_button->set_sensitive (true); - apply_button->set_sensitive (true); - if (backend->can_change_sample_rate_when_running() && sample_rate_combo.get_children().size() > 0) { - sample_rate_combo.set_sensitive (true); - } - if (backend->can_change_buffer_size_when_running() && buffer_size_combo.get_children().size() > 0) { - buffer_size_combo.set_sensitive (true); - } + devices_available = set_device_popdown_strings (); + } - } + if (devices_available) { + device_changed (); + } else { + device_combo.clear(); + input_device_combo.clear(); + output_device_combo.clear(); } + update_sensitivity (); } void EngineControl::driver_changed () { + SignalBlocker blocker (*this, "driver_changed"); boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); assert (backend); @@ -881,100 +1211,201 @@ 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_rates2 (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; - { - PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); + if (_have_control) { + sr = get_sample_rates_for_all_devices (); + } else { + sr = get_default_sample_rates (); + } - /* 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 */ + set_popdown_strings (sample_rate_combo, s); - string desired; + if (!s.empty()) { + 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(); - } - } + } + update_sensitivity (); +} - if (!s.empty()) { - sample_rate_combo.set_sensitive (true); - set_popdown_strings (sample_rate_combo, s); +vector +EngineControl::get_buffer_sizes_for_all_devices () +{ + boost::shared_ptr backend = + ARDOUR::AudioEngine::instance ()->current_backend (); + vector 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); - } + if (backend->use_separate_input_and_output_devices ()) { + all_sizes = backend->available_buffer_sizes2 (get_input_device_name (), get_output_device_name ()); + } else { + all_sizes = backend->available_buffer_sizes (get_device_name ()); + } + return all_sizes; +} - } else { - sample_rate_combo.set_sensitive (false); - } +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; +} + +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; + + if (_have_control) { + bs = get_buffer_sizes_for_all_devices (); + } 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; + set_popdown_strings (buffer_size_combo, 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); + if (!s.empty()) { + buffer_size_combo.set_active_text (s.front()); + + uint32_t period = backend->buffer_size(); + if (0 == period && backend->use_separate_input_and_output_devices ()) { + period = backend->default_buffer_size (get_input_device_name ()); + } + if (0 == period && backend->use_separate_input_and_output_devices ()) { + period = backend->default_buffer_size (get_output_device_name ()); } - s.clear (); - for (vector::const_iterator x = bs.begin(); x != bs.end(); ++x) { - s.push_back (bufsize_as_string (*x)); + if (0 == period && !backend->use_separate_input_and_output_devices ()) { + period = backend->default_buffer_size (get_device_name ()); } - if (!s.empty()) { - buffer_size_combo.set_sensitive (true); - set_popdown_strings (buffer_size_combo, s); + set_active_text_if_present (buffer_size_combo, bufsize_as_string (period)); + show_buffer_duration (); + } + update_sensitivity (); +} - buffer_size_combo.set_active_text (bufsize_as_string (backend->default_buffer_size(device_name))); - 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); + + string device_name_in; + string device_name_out; // only used if backend support separate I/O devices + + 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 - */ + /* TODO set min + max channel counts here */ manage_control_app_sensitivity (); } @@ -986,44 +1417,54 @@ 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) { /* 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; } 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). */ show_buffer_duration (); - if (!ignore_changes) { - save_state (); - } } void EngineControl::buffer_size_changed () { + DEBUG_ECONTROL ("buffer_size_changed"); show_buffer_duration (); - if (!ignore_changes) { - save_state (); - } } void EngineControl::show_buffer_duration () { - + DEBUG_ECONTROL ("show_buffer_duration"); /* buffer sizes - convert from just samples to samples + msecs for * the displayed string */ @@ -1032,21 +1473,32 @@ EngineControl::show_buffer_duration () uint32_t samples = atoi (bs_text); /* will ignore trailing text */ uint32_t rate = get_rate(); - /* Translators: "msecs" is ALWAYS plural here, so we do not - need singular form as well. - */ /* Developers: note the hard-coding of a double buffered model in the (2 * samples) computation of latency. we always start the audiobackend in this configuration. */ + /* note to jack1 developers: ardour also always starts the engine + * in async mode (no jack2 --sync option) which adds an extra cycle + * of latency with jack2 (and *3 would be correct) + * The value can also be wrong if jackd is started externally.. + * + * At the time of writing the ALSA backend always uses double-buffering *2, + * The Dummy backend *1, and who knows what ASIO really does :) + * + * So just display the period size, that's also what + * ARDOUR_UI::update_sample_rate() does for the status bar. + * (the statusbar calls AudioEngine::instance()->usecs_per_cycle() + * but still, that's the buffer period, not [round-trip] latency) + */ char buf[32]; - snprintf (buf, sizeof (buf), _("(%.1f msecs)"), (2 * samples) / (rate/1000.0)); + snprintf (buf, sizeof (buf), _("(%.1f ms)"), (samples / (rate/1000.0f))); buffer_size_duration_label.set_text (buf); } void EngineControl::midi_option_changed () { + DEBUG_ECONTROL ("midi_option_changed"); boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); assert (backend); @@ -1081,18 +1533,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 @@ -1111,23 +1556,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 () { @@ -1146,9 +1627,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; @@ -1166,6 +1645,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 (); @@ -1191,7 +1672,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. */ @@ -1209,6 +1690,8 @@ EngineControl::maybe_display_saved_state () XMLNode& EngineControl::get_state () { + LocaleGuard lg (X_("C")); + XMLNode* root = new XMLNode ("AudioMIDISetup"); std::string path; @@ -1222,6 +1705,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); @@ -1252,6 +1737,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; @@ -1260,8 +1761,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(); @@ -1302,6 +1805,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; } @@ -1404,24 +1917,105 @@ EngineControl::set_state (const XMLNode& root) for (StateList::const_iterator i = states.begin(); i != states.end(); ++i) { if ((*i)->active) { - ignore_changes++; - 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)); - buffer_size_combo.set_active_text (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; + 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, downcase (PROGRAM_NAME), ""))) { + 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) { @@ -1455,7 +2049,20 @@ EngineControl::push_state_to_backend (bool start) } } - if (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; } @@ -1524,6 +2131,8 @@ EngineControl::push_state_to_backend (bool start) } } + queue_device_changed = false; + if (!_have_control) { /* We do not have control over the backend, so the best we can @@ -1603,9 +2212,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; @@ -1682,6 +2302,8 @@ EngineControl::post_push () if (!state) { state = save_state (); assert (state); + } else { + store_state(state); } /* all off */ @@ -1726,6 +2348,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 (); } @@ -1741,12 +2365,22 @@ EngineControl::get_midi_option () const uint32_t EngineControl::get_input_channels() const { + if (ARDOUR::Profile->get_mixbus()) { + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + if (!backend) return 0; + return backend->input_channels(); + } return (uint32_t) input_channels_adjustment.get_value(); } uint32_t EngineControl::get_output_channels() const { + if (ARDOUR::Profile->get_mixbus()) { + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + if (!backend) return 0; + return backend->input_channels(); + } return (uint32_t) output_channels_adjustment.get_value(); } @@ -1771,7 +2405,7 @@ EngineControl::get_backend () const string EngineControl::get_driver () const { - if (driver_combo.get_sensitive() && driver_combo.get_parent()) { + if (driver_combo.get_parent()) { return driver_combo.get_active_text (); } else { return ""; @@ -1784,6 +2418,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 () { @@ -1796,6 +2442,12 @@ EngineControl::control_app_button_clicked () backend->launch_control_app (); } +void +EngineControl::stop_engine_button_clicked () +{ + ARDOUR::AudioEngine::instance()->stop (); +} + void EngineControl::manage_control_app_sensitivity () { @@ -1826,9 +2478,8 @@ EngineControl::on_switch_page (GtkNotebookPage*, guint page_num) { if (page_num == 0) { cancel_button->set_sensitive (true); - ok_button->set_sensitive (true); - apply_button->set_sensitive (true); _measure_midi.reset(); + update_sensitivity (); } else { cancel_button->set_sensitive (false); ok_button->set_sensitive (false); @@ -1938,6 +2589,8 @@ EngineControl::check_audio_latency_measurement () solid = false; } + lm_results.set_markup (string_compose (results_markup, buf)); + if (solid) { have_lm_results = true; end_latency_detection (); @@ -1945,8 +2598,6 @@ EngineControl::check_audio_latency_measurement () return false; } - lm_results.set_markup (string_compose (results_markup, buf)); - return true; } @@ -1998,6 +2649,7 @@ EngineControl::check_midi_latency_measurement () have_lm_results = true; end_latency_detection (); lm_use_button.set_sensitive (true); + lm_results.set_markup (string_compose (results_markup, buf)); return false; } else if (mididm->processed () > 400) { have_lm_results = false; @@ -2106,16 +2758,19 @@ 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); - sample_rate_combo.set_sensitive (true); - connect_disconnect_button.set_label (string_compose (_("Disconnect from %1"), backend->name())); connect_disconnect_button.show(); started_at_least_once = true; + if (_have_control) { + engine_status.set_markup(string_compose ("%1", _("Running"))); + } else { + engine_status.set_markup(string_compose ("%1", _("Connected"))); + } + update_sensitivity(); } void @@ -2124,12 +2779,19 @@ EngineControl::engine_stopped () boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); assert (backend); - buffer_size_combo.set_sensitive (false); connect_disconnect_button.set_label (string_compose (_("Connect to %1"), backend->name())); connect_disconnect_button.show(); - sample_rate_combo.set_sensitive (true); - buffer_size_combo.set_sensitive (true); + engine_status.set_markup(X_("")); + update_sensitivity(); +} + +void +EngineControl::device_list_changed () +{ + PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); // ?? + list_devices (); + midi_option_changed(); } void