X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fengine_dialog.cc;h=6f6d31ff182b3ab044953679c23a47667f471d85;hb=3dc7728038860bda6eb4b0de1f4a3e14ec9e86cc;hp=1e8058e73fbae317cb3788a9f19542cf72228966;hpb=c8f8f758318f62d16051dc7ffb3155c0c0df1ddc;p=ardour.git diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 1e8058e73f..6f6d31ff18 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -20,7 +20,6 @@ #include #include #include -#include #include #include @@ -86,6 +85,9 @@ EngineControl::EngineControl () , ports_spinner (ports_adjustment) , control_app_button (_("Device Control Panel")) , midi_devices_button (_("Midi Device Setup")) + , start_stop_button (_("Stop")) + , update_devices_button (_("Refresh Devices")) + , use_buffered_io_button (_("Use Buffered I/O"), ArdourButton::led_default_elements) , lm_measure_label (_("Measure")) , lm_use_button (_("Use results")) , lm_back_button (_("Back to settings ... (ignore results)")) @@ -95,9 +97,11 @@ EngineControl::EngineControl () , lm_running (false) , midi_back_button (_("Back to settings")) , ignore_changes (0) + , ignore_device_changes (0) , _desired_sample_rate (0) , started_at_least_once (false) , queue_device_changed (false) + , _have_control (true) , block_signals(0) { using namespace Notebook_Helpers; @@ -184,7 +188,8 @@ EngineControl::EngineControl () lm_measure_button.add (lm_measure_label); lm_measure_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::latency_button_clicked)); lm_use_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::use_latency_button_clicked)); - lm_back_button_signal = lm_back_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (notebook, &Gtk::Notebook::set_current_page), 0)); + lm_back_button_signal = lm_back_button.signal_clicked().connect( + sigc::mem_fun(*this, &EngineControl::latency_back_button_clicked)); lm_use_button.set_sensitive (false); @@ -251,9 +256,6 @@ EngineControl::EngineControl () get_vbox()->set_border_width (12); get_vbox()->pack_start (notebook); - get_action_area()->pack_start (engine_status); - engine_status.show(); - /* need a special function to print "all available channels" when the * channel counts hit zero. */ @@ -262,15 +264,30 @@ EngineControl::EngineControl () output_channels.signal_output().connect (sigc::bind (sigc::ptr_fun (&EngineControl::print_channel_count), &output_channels)); midi_devices_button.signal_clicked.connect (mem_fun (*this, &EngineControl::configure_midi_devices)); - midi_devices_button.set_sensitive (false); 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 (); + start_stop_button.signal_clicked.connect (mem_fun (*this, &EngineControl::start_stop_button_clicked)); + start_stop_button.set_sensitive (false); + start_stop_button.set_name ("generic button"); + start_stop_button.set_can_focus(true); + + update_devices_button.signal_clicked.connect (mem_fun (*this, &EngineControl::update_devices_button_clicked)); + update_devices_button.set_sensitive (false); + update_devices_button.set_name ("generic button"); + update_devices_button.set_can_focus(true); + + use_buffered_io_button.signal_clicked.connect (mem_fun (*this, &EngineControl::use_buffered_io_button_clicked)); + use_buffered_io_button.set_sensitive (false); + use_buffered_io_button.set_name ("generic button"); + use_buffered_io_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 */ @@ -283,31 +300,25 @@ 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()); - } - - backend_changed (); - - /* in case the setting the backend failed, e.g. stale config, from set_state(), try again */ - if (0 == ARDOUR::AudioEngine::instance()->current_backend()) { - 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 (); + if (!set_state (*audio_setup)) { + set_default_state (); + } + } else { + set_default_state (); } + update_sensitivity (); connect_changed_signals (); 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_disconnect_button.set_no_show_all(); + use_buffered_io_button.set_no_show_all(); + update_devices_button.set_no_show_all(); + start_stop_button.set_no_show_all(); + midi_devices_button.set_no_show_all(); } void @@ -321,6 +332,8 @@ EngineControl::connect_changed_signals () 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)); + nperiods_combo_connection = nperiods_combo.signal_changed ().connect ( + sigc::mem_fun (*this, &EngineControl::nperiods_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 ( @@ -350,6 +363,7 @@ EngineControl::block_changed_signals () driver_combo_connection.block (); sample_rate_combo_connection.block (); buffer_size_combo_connection.block (); + nperiods_combo_connection.block (); device_combo_connection.block (); input_device_combo_connection.block (); output_device_combo_connection.block (); @@ -370,6 +384,7 @@ EngineControl::unblock_changed_signals () driver_combo_connection.unblock (); sample_rate_combo_connection.unblock (); buffer_size_combo_connection.unblock (); + nperiods_combo_connection.unblock (); device_combo_connection.unblock (); input_device_combo_connection.unblock (); output_device_combo_connection.unblock (); @@ -408,48 +423,82 @@ EngineControl::on_show () ok_button->grab_focus(); } +bool +EngineControl::try_autostart () +{ + if (!start_stop_button.get_sensitive()) { + return false; + } + if (ARDOUR::AudioEngine::instance()->running()) { + return true; + } + return start_engine (); +} + +bool +EngineControl::start_engine () +{ + if (push_state_to_backend(true) != 0) { + MessageDialog msg(*this, + ARDOUR::AudioEngine::instance()->get_last_backend_error()); + msg.run(); + return false; + } + return true; +} + +bool +EngineControl::stop_engine (bool for_latency) +{ + if (ARDOUR::AudioEngine::instance()->stop(for_latency)) { + MessageDialog msg(*this, + ARDOUR::AudioEngine::instance()->get_last_backend_error()); + msg.run(); + return false; + } + return true; +} + void EngineControl::on_response (int response_id) { ArdourDialog::on_response (response_id); switch (response_id) { - case RESPONSE_APPLY: - push_state_to_backend (true); - break; - case RESPONSE_OK: + case RESPONSE_OK: + if (!start_engine()) { + return; + } else { + hide(); + } #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(); - } + + // 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; - ev.type = GDK_BUTTON_PRESS; - ev.button = 1; - on_delete_event ((GdkEventAny*) &ev); - break; - } - default: - hide (); + break; + case RESPONSE_DELETE_EVENT: { + GdkEventButton ev; + ev.type = GDK_BUTTON_PRESS; + ev.button = 1; + on_delete_event((GdkEventAny*)&ev); + break; + } + case RESPONSE_CANCEL: + if (ARDOUR_UI::instance() && ARDOUR_UI::instance()->session_loaded) { + ARDOUR_UI::instance()->check_audioengine(*this); + } + // fall through + default: + hide(); } } @@ -472,6 +521,13 @@ 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 (start_stop_button, 3, 4, 0, 1, xopt, xopt); + basic_packer.attach (update_devices_button, 3, 4, 1, 2, xopt, xopt); + basic_packer.attach (use_buffered_io_button, 3, 4, 2, 3, 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); @@ -544,9 +600,18 @@ EngineControl::build_full_control_notebook () 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 */ + int ctrl_btn_span = 1; + if (backend->can_set_period_size ()) { + row++; + label = manage (left_aligned_label (_("Periods:"))); + basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0); + basic_packer.attach (nperiods_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0); + ++ctrl_btn_span; + } - basic_packer.attach (control_app_button, 3, 4, row-1, row+1, xopt, xopt); + /* button spans 2 or 3 rows */ + + basic_packer.attach (control_app_button, 3, 4, row - ctrl_btn_span, row + 1, xopt, xopt); row++; input_channels.set_name ("InputChannels"); @@ -561,7 +626,7 @@ EngineControl::build_full_control_notebook () 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); @@ -574,7 +639,7 @@ EngineControl::build_full_control_notebook () 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); @@ -693,7 +758,8 @@ EngineControl::enable_latency_tab () lm_back_button_signal = lm_back_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (notebook, &Gtk::Notebook::set_current_page), midi_tab)); lm_preamble.hide (); } else { - lm_back_button_signal = lm_back_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (notebook, &Gtk::Notebook::set_current_page), 0)); + lm_back_button_signal = lm_back_button.signal_clicked().connect( + sigc::mem_fun(*this, &EngineControl::latency_back_button_clicked)); lm_preamble.show (); } @@ -727,6 +793,139 @@ 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); + start_stop_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 (get_popdown_string_count (nperiods_combo) > 0) { + if (!ARDOUR::AudioEngine::instance()->running()) { + nperiods_combo.set_sensitive (true); + } else { + nperiods_combo.set_sensitive (false); + } + } else { + nperiods_combo.set_sensitive (false); + } + + if (_have_control) { + start_stop_button.set_sensitive(true); + start_stop_button.show(); + if (ARDOUR::AudioEngine::instance()->running()) { + start_stop_button.set_text("Stop"); + update_devices_button.set_sensitive(false); + use_buffered_io_button.set_sensitive(false); + } else { + if (backend->can_request_update_devices()) { + update_devices_button.show(); + } else { + update_devices_button.hide(); + } + if (backend->can_use_buffered_io()) { + use_buffered_io_button.show(); + } else { + use_buffered_io_button.hide(); + } + start_stop_button.set_text("Start"); + update_devices_button.set_sensitive(true); + use_buffered_io_button.set_sensitive(true); + } + } else { + update_devices_button.set_sensitive(false); + update_devices_button.hide(); + use_buffered_io_button.set_sensitive(false); + use_buffered_io_button.hide(); + start_stop_button.set_sensitive(false); + start_stop_button.hide(); + } + + 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); + } 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); + } + } + + if (valid || !_have_control) { + ok_button->set_sensitive (true); + } else { + ok_button->set_sensitive (false); + } +} + void EngineControl::setup_midi_tab_for_jack () { @@ -824,12 +1023,11 @@ EngineControl::refresh_midi_display (std::string focus) void EngineControl::backend_changed () { - DEBUG_ECONTROL ("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 (std::string(PROGRAM_NAME)), ""))) { /* eh? setting the backend failed... how ? */ /* A: stale config contains a backend that does not exist in current build */ return; @@ -844,42 +1042,53 @@ 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 (); - - DEBUG_ECONTROL (string_compose ("backend->driver_name: %1", current_driver)); - - // 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); - DEBUG_ECONTROL ( - string_compose ("driver_combo.set_active_text: %1", current_driver)); - 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 (!_have_control) { + // set settings from backend that we do have control over + set_active_text_if_present (buffer_size_combo, bufsize_as_string (backend->buffer_size())); + } + + if (_have_control && !ignore_changes) { + // set driver & devices + State state = get_matching_state (backend_combo.get_active_text()); + if (state) { + PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); + set_current_state (state); + } + } + + 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) { @@ -894,16 +1103,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 @@ -912,7 +1111,7 @@ 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")); @@ -924,24 +1123,76 @@ EngineControl::print_channel_count (Gtk::SpinButton* sb) return true; } +// @return true if there are drivers available bool EngineControl::set_driver_popdown_strings () { DEBUG_ECONTROL ("set_driver_popdown_strings"); - string backend_name = backend_combo.get_active_text(); - boost::shared_ptr backend; + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + vector drivers = backend->enumerate_drivers(); - if (!(backend = ARDOUR::AudioEngine::instance()->set_backend (backend_name, "ardour", ""))) { - /* eh? setting the backend failed... how ? */ - /* A: stale config contains a backend that does not exist in current build */ + if (drivers.empty ()) { + // This is an error...? return false; } - vector drivers = backend->enumerate_drivers(); + 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; } +std::string +EngineControl::get_default_device(const string& current_device_name, + const vector& available_devices) +{ + // If the current device is available, use it as default + if (std::find (available_devices.begin (), + available_devices.end (), + current_device_name) != available_devices.end ()) { + + return current_device_name; + } + + using namespace ARDOUR; + + string default_device_name = + AudioBackend::get_standard_device_name(AudioBackend::DeviceDefault); + + vector::const_iterator i; + + // If there is a "Default" device available, use it + for (i = available_devices.begin(); i != available_devices.end(); ++i) { + if (*i == default_device_name) { + return *i; + } + } + + string none_device_name = + AudioBackend::get_standard_device_name(AudioBackend::DeviceNone); + + // Use the first device that isn't "None" + for (i = available_devices.begin(); i != available_devices.end(); ++i) { + if (*i != none_device_name) { + return *i; + } + } + + // Use "None" if there are no other available + return available_devices.front(); +} + // @return true if there are devices available bool EngineControl::set_device_popdown_strings () @@ -965,38 +1216,20 @@ EngineControl::set_device_popdown_strings () available_devices.push_back (i->name); } + if (available_devices.empty ()) { + return false; + } - if (!available_devices.empty()) { - - { - string current_device, found_device; - current_device = device_combo.get_active_text (); - if (current_device == "") { - current_device = backend->device_name (); - } - - // Make sure that the active text is still relevant for this - // device (it might only be relevant to the previous device!!) - for (vector::const_iterator i = available_devices.begin(); i != available_devices.end(); ++i) { - if (*i == current_device) - found_device = current_device; - } - if (found_device == "") - // device has never been set (or was not relevant - // for this backend) Let's make sure it's not blank - current_device = available_devices.front (); + set_popdown_strings (device_combo, available_devices); - PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); - set_popdown_strings (device_combo, available_devices); - DEBUG_ECONTROL (string_compose ("set device_combo active text: %1", current_device)); + std::string default_device = + get_default_device(backend->device_name(), available_devices); - device_combo.set_active_text (current_device); - } + DEBUG_ECONTROL ( + string_compose ("set device_combo active text: %1", default_device)); - device_changed (); - return true; - } - return false; + device_combo.set_active_text(default_device); + return true; } // @return true if there are input devices available @@ -1013,38 +1246,19 @@ EngineControl::set_input_device_popdown_strings () available_devices.push_back (i->name); } - if (!available_devices.empty()) { - - { - string current_device, found_device; - current_device = input_device_combo.get_active_text (); - if (current_device == "") { - current_device = backend->input_device_name (); - } - - // Make sure that the active text is still relevant for this - // device (it might only be relevant to the previous device!!) - for (vector::const_iterator i = available_devices.begin(); i != available_devices.end(); ++i) { - if (*i == current_device) - found_device = current_device; - } - if (found_device == "") - // device has never been set (or was not relevant - // for this backend) Let's make sure it's not blank - current_device = available_devices.front (); + if (available_devices.empty()) { + return false; + } - PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); - set_popdown_strings (input_device_combo, available_devices); + 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); - } + std::string default_device = + get_default_device(backend->input_device_name(), available_devices); - device_changed (); - return true; - } - - return false; + DEBUG_ECONTROL ( + string_compose ("set input_device_combo active text: %1", default_device)); + input_device_combo.set_active_text(default_device); + return true; } // @return true if there are output devices available @@ -1061,38 +1275,19 @@ EngineControl::set_output_device_popdown_strings () available_devices.push_back (i->name); } - if (!available_devices.empty()) { - - { - string current_device, found_device; - current_device = output_device_combo.get_active_text (); - if (current_device == "") { - current_device = backend->output_device_name (); - } - - // Make sure that the active text is still relevant for this - // device (it might only be relevant to the previous device!!) - for (vector::const_iterator i = available_devices.begin(); i != available_devices.end(); ++i) { - if (*i == current_device) - found_device = current_device; - } - if (found_device == "") - // device has never been set (or was not relevant - // for this backend) Let's make sure it's not blank - current_device = available_devices.front (); + if (available_devices.empty()) { + return false; + } - PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); - set_popdown_strings (output_device_combo, available_devices); + set_popdown_strings (output_device_combo, available_devices); - DEBUG_ECONTROL (string_compose ("set input_device_combo active text: %1", current_device)); - output_device_combo.set_active_text (current_device); - } + std::string default_device = + get_default_device(backend->output_device_name(), available_devices); - device_changed (); - return true; - } - - return false; + DEBUG_ECONTROL ( + string_compose ("set output_device_combo active text: %1", default_device)); + output_device_combo.set_active_text(default_device); + return true; } void @@ -1115,58 +1310,65 @@ EngineControl::list_devices () } if (devices_available) { - input_latency.set_sensitive (true); - output_latency.set_sensitive (true); - input_channels.set_sensitive (true); - output_channels.set_sensitive (true); - - ok_button->set_sensitive (true); - apply_button->set_sensitive (true); - + device_changed (); } 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); - 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); - } - - } } + update_sensitivity (); } void EngineControl::driver_changed () { - DEBUG_ECONTROL ("driver_changed"); + SignalBlocker blocker (*this, "driver_changed"); boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); assert (backend); backend->set_driver (driver_combo.get_active_text()); list_devices (); + // TODO load LRU device(s) for backend + driver combo + if (!ignore_changes) { maybe_display_saved_state (); } } +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 (const std::string& device_name) +EngineControl::set_samplerate_popdown_strings () { DEBUG_ECONTROL ("set_samplerate_popdown_strings"); boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); @@ -1175,18 +1377,9 @@ EngineControl::set_samplerate_popdown_strings (const std::string& device_name) vector s; if (_have_control) { - sr = backend->available_sample_rates (device_name); + sr = get_sample_rates_for_all_devices (); } 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); + sr = get_default_sample_rates (); } for (vector::const_iterator x = sr.begin(); x != sr.end(); ++x) { @@ -1196,23 +1389,60 @@ EngineControl::set_samplerate_popdown_strings (const std::string& device_name) } } + set_popdown_strings (sample_rate_combo, s); + if (!s.empty()) { - sample_rate_combo.set_sensitive (true); - set_popdown_strings (sample_rate_combo, s); + if (desired.empty ()) { + float new_active_sr = backend->default_sample_rate (); + + if (std::find (sr.begin (), sr.end (), new_active_sr) == sr.end ()) { + new_active_sr = sr.front (); + } - if (desired.empty()) { - sample_rate_combo.set_active_text (rate_as_string (backend->default_sample_rate())); + sample_rate_combo.set_active_text (rate_as_string (new_active_sr)); } else { sample_rate_combo.set_active_text (desired); } + } + update_sensitivity (); +} + +vector +EngineControl::get_buffer_sizes_for_all_devices () +{ + boost::shared_ptr backend = + ARDOUR::AudioEngine::instance ()->current_backend (); + vector all_sizes; + + if (backend->use_separate_input_and_output_devices ()) { + all_sizes = backend->available_buffer_sizes2 (get_input_device_name (), get_output_device_name ()); } else { - sample_rate_combo.set_sensitive (false); + all_sizes = backend->available_buffer_sizes (get_device_name ()); } + return all_sizes; +} + +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 (const std::string& device_name) +EngineControl::set_buffersize_popdown_strings () { DEBUG_ECONTROL ("set_buffersize_popdown_strings"); boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); @@ -1220,45 +1450,77 @@ EngineControl::set_buffersize_popdown_strings (const std::string& device_name) vector s; if (_have_control) { - bs = backend->available_buffer_sizes (device_name); + bs = get_buffer_sizes_for_all_devices (); } 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 (); + bs = get_default_buffer_sizes (); + } + for (vector::const_iterator x = bs.begin(); x != bs.end(); ++x) { s.push_back (bufsize_as_string (*x)); } + uint32_t previous_size = 0; + if (!buffer_size_combo.get_active_text().empty()) { + previous_size = get_buffer_size (); + } + + set_popdown_strings (buffer_size_combo, s); + 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); + if (std::find(bs.begin(), bs.end(), previous_size) != bs.end()) { + buffer_size_combo.set_active_text(bufsize_as_string(previous_size)); + } else { + + 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()); + } + if (0 == period && !backend->use_separate_input_and_output_devices()) { + period = backend->default_buffer_size(get_device_name()); + } + + set_active_text_if_present(buffer_size_combo, bufsize_as_string(period)); } - set_active_text_if_present (buffer_size_combo, bufsize_as_string (period)); show_buffer_duration (); - } else { - buffer_size_combo.set_sensitive (false); } + update_sensitivity (); +} + +void +EngineControl::set_nperiods_popdown_strings () +{ + DEBUG_ECONTROL ("set_nperiods_popdown_strings"); + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + vector np; + vector s; + + if (backend->can_set_period_size()) { + np = backend->available_period_sizes (get_driver()); + } + + for (vector::const_iterator x = np.begin(); x != np.end(); ++x) { + s.push_back (nperiods_as_string (*x)); + } + + set_popdown_strings (nperiods_combo, s); + + if (!s.empty()) { + set_active_text_if_present (nperiods_combo, nperiods_as_string (backend->period_size())); // XXX + } + + update_sensitivity (); } void EngineControl::device_changed () { - DEBUG_ECONTROL ("device_changed"); + SignalBlocker blocker (*this, "device_changed"); boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); assert (backend); @@ -1286,7 +1548,7 @@ EngineControl::device_changed () 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); @@ -1301,13 +1563,11 @@ EngineControl::device_changed () */ PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); - /* backends that support separate devices, need to ignore - * the device-name - and use the devies set above - */ - set_samplerate_popdown_strings (device_name_in); - set_buffersize_popdown_strings (device_name_in); - /* XXX theoretically need to set min + max channel counts here - */ + set_samplerate_popdown_strings (); + set_buffersize_popdown_strings (); + set_nperiods_popdown_strings (); + + /* TODO set min + max channel counts here */ manage_control_app_sensitivity (); } @@ -1344,6 +1604,15 @@ EngineControl::bufsize_as_string (uint32_t sz) return buf; } +string +EngineControl::nperiods_as_string (uint32_t np) +{ + char buf[8]; + snprintf (buf, sizeof (buf), "%u", np); + return buf; +} + + void EngineControl::sample_rate_changed () { @@ -1363,6 +1632,13 @@ EngineControl::buffer_size_changed () show_buffer_duration (); } +void +EngineControl::nperiods_changed () +{ + DEBUG_ECONTROL ("nperiods_changed"); + show_buffer_duration (); +} + void EngineControl::show_buffer_duration () { @@ -1375,17 +1651,12 @@ EngineControl::show_buffer_duration () uint32_t samples = atoi (bs_text); /* will ignore trailing text */ uint32_t rate = get_rate(); - /* 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.. + /* Except for ALSA and Dummy backends, we don't know the number of periods + * per cycle and settings. * - * At the time of writing the ALSA backend always uses double-buffering *2, - * The Dummy backend *1, and who knows what ASIO really does :) + * jack1 vs jack2 have different default latencies since jack2 start + * in async-mode unless --sync is given which adds an extra cycle + * of latency. The value is not known if jackd is started externally.. * * So just display the period size, that's also what * ARDOUR_UI::update_sample_rate() does for the status bar. @@ -1431,9 +1702,9 @@ EngineControl::midi_option_changed () _midi_devices = new_devices; if (_midi_devices.empty()) { - midi_devices_button.set_sensitive (false); + midi_devices_button.hide (); } else { - midi_devices_button.set_sensitive (true); + midi_devices_button.show (); } } @@ -1442,6 +1713,17 @@ EngineControl::parameter_changed () { } +EngineControl::State +EngineControl::get_matching_state (const string& backend) +{ + for (StateList::iterator i = states.begin(); i != states.end(); ++i) { + if ((*i)->backend == backend) { + return (*i); + } + } + return State(); +} + EngineControl::State EngineControl::get_matching_state ( const string& backend, @@ -1511,6 +1793,19 @@ bool EngineControl::equivalent_states (const EngineControl::State& state1, return false; } +bool +EngineControl::state_sort_cmp (const State &a, const State &b) { + if (a->active) { + return true; + } + else if (b->active) { + return false; + } + else { + return a->lru < b->lru; + } +} + EngineControl::State EngineControl::save_state () { @@ -1519,6 +1814,7 @@ EngineControl::save_state () if (!_have_control) { state = get_matching_state (backend_combo.get_active_text(), string(), string()); if (state) { + state->lru = time (NULL) ; return state; } state.reset(new StateStruct); @@ -1538,6 +1834,8 @@ EngineControl::save_state () states.push_back (state); + states.sort (state_sort_cmp); + return state; } @@ -1551,12 +1849,15 @@ EngineControl::store_state (State state) state->output_device = get_output_device_name (); state->sample_rate = get_rate (); state->buffer_size = get_buffer_size (); + state->n_periods = get_nperiods (); state->input_latency = get_input_latency (); state->output_latency = get_output_latency (); state->input_channels = get_input_channels (); state->output_channels = get_output_channels (); state->midi_option = get_midi_option (); state->midi_devices = _midi_devices; + state->use_buffered_io = get_use_buffered_io (); + state->lru = time (NULL) ; } void @@ -1569,12 +1870,15 @@ EngineControl::maybe_display_saved_state () State state = get_saved_state_for_currently_displayed_backend_and_device (); if (state) { + DEBUG_ECONTROL ("Restoring saved state"); PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); if (!_desired_sample_rate) { 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)); + + set_active_text_if_present (nperiods_combo, nperiods_as_string (state->n_periods)); /* call this explicitly because we're ignoring changes to the controls at this point. */ @@ -1582,17 +1886,21 @@ EngineControl::maybe_display_saved_state () input_latency.set_value (state->input_latency); output_latency.set_value (state->output_latency); + use_buffered_io_button.set_active (state->use_buffered_io); + if (!state->midi_option.empty()) { midi_option_combo.set_active_text (state->midi_option); _midi_devices = state->midi_devices; } + } else { + DEBUG_ECONTROL ("Unable to find saved state for backend and devices"); } } XMLNode& EngineControl::get_state () { - LocaleGuard lg (X_("C")); + LocaleGuard lg (); XMLNode* root = new XMLNode ("AudioMIDISetup"); std::string path; @@ -1611,12 +1919,15 @@ EngineControl::get_state () 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 ("n-periods", (*i)->n_periods); node->add_property ("input-latency", (*i)->input_latency); node->add_property ("output-latency", (*i)->output_latency); node->add_property ("input-channels", (*i)->input_channels); node->add_property ("output-channels", (*i)->output_channels); node->add_property ("active", (*i)->active ? "yes" : "no"); + node->add_property ("use-buffered-io", (*i)->use_buffered_io ? "yes" : "no"); node->add_property ("midi-option", (*i)->midi_option); + node->add_property ("lru", (*i)->active ? time (NULL) : (*i)->lru); XMLNode* midi_devices = new XMLNode ("MIDIDevices"); for (std::vector::const_iterator p = (*i)->midi_devices.begin(); p != (*i)->midi_devices.end(); ++p) { @@ -1639,18 +1950,34 @@ 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; XMLNodeConstIterator citer, cciter; - XMLNode* child; - XMLNode* grandchild; - XMLProperty* prop = NULL; + XMLNode const * child; + XMLNode const * grandchild; + XMLProperty const * prop = NULL; fprintf (stderr, "EngineControl::set_state\n"); if (root.name() != "AudioMIDISetup") { - return; + return false; } clist = root.children(); @@ -1711,6 +2038,13 @@ EngineControl::set_state (const XMLNode& root) } state->buffer_size = atoi (prop->value ()); + if ((prop = grandchild->property ("n-periods")) == 0) { + // optional (new value in 4.5) + state->n_periods = 0; + } else { + state->n_periods = atoi (prop->value ()); + } + if ((prop = grandchild->property ("input-latency")) == 0) { continue; } @@ -1736,6 +2070,11 @@ EngineControl::set_state (const XMLNode& root) } state->active = string_is_affirmative (prop->value ()); + if ((prop = grandchild->property ("use-buffered-io")) == 0) { + continue; + } + state->use_buffered_io = string_is_affirmative (prop->value ()); + if ((prop = grandchild->property ("midi-option")) == 0) { continue; } @@ -1764,6 +2103,10 @@ EngineControl::set_state (const XMLNode& root) } } + if ((prop = grandchild->property ("lru"))) { + state->lru = atoi (prop->value ()); + } + #if 1 /* remove accumulated duplicates (due to bug in ealier version) * this can be removed again before release @@ -1800,42 +2143,113 @@ EngineControl::set_state (const XMLNode& root) } } + states.sort (state_sort_cmp); + for (StateList::const_iterator i = states.begin(); i != states.end(); ++i) { if ((*i)->active) { - set_current_state (*i); - break; + return set_current_state (*i); } } + return false; } -void +bool EngineControl::set_current_state (const State& state) { DEBUG_ECONTROL ("set_current_state"); - PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); + + boost::shared_ptr backend; + + if (!(backend = ARDOUR::AudioEngine::instance ()->set_backend ( + state->backend, downcase (std::string(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); - /* The driver popdown strings need to be populated now so that - * set_active_text will actually set a valid entry. Then - * backend_changed() will populate all the other combo's so they - * can also be set to valid entries and the state will be restored - * correctly. - */ - if (!state->driver.empty()) { - set_driver_popdown_strings (); + if (!ARDOUR::AudioEngine::instance()->setup_required ()) { + backend_changed (); + // we don't have control don't restore state + return true; } - driver_combo.set_active_text (state->driver); + + + 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)); + set_active_text_if_present (nperiods_combo, nperiods_as_string (state->n_periods)); input_latency.set_value (state->input_latency); output_latency.set_value (state->output_latency); midi_option_combo.set_active_text (state->midi_option); + use_buffered_io_button.set_active (state->use_buffered_io); + return true; } int @@ -1843,6 +2257,7 @@ EngineControl::push_state_to_backend (bool start) { DEBUG_ECONTROL ("push_state_to_backend"); boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + PBD::Unwinder protect_ignore_device_changes (ignore_device_changes, ignore_device_changes + 1); if (!backend) { return 0; @@ -1856,9 +2271,11 @@ EngineControl::push_state_to_backend (bool start) bool change_device = false; bool change_rate = false; bool change_bufsize = false; + bool change_nperiods = false; bool change_latency = false; bool change_channels = false; bool change_midi = false; + bool change_buffered_io = false; uint32_t ochan = get_output_channels (); uint32_t ichan = get_input_channels (); @@ -1900,10 +2317,21 @@ EngineControl::push_state_to_backend (bool start) change_bufsize = true; } + if (backend->can_set_period_size() && get_popdown_string_count (nperiods_combo) > 0 + && get_nperiods() != backend->period_size()) { + change_nperiods = true; + } + if (get_midi_option() != backend->midi_option()) { change_midi = true; } + if (backend->can_use_buffered_io()) { + if (get_use_buffered_io() != backend->get_use_buffered_io()) { + change_buffered_io = true; + } + } + /* zero-requested channels means "all available" */ if (ichan == 0) { @@ -1939,6 +2367,7 @@ EngineControl::push_state_to_backend (bool start) change_channels = true; change_latency = true; change_midi = true; + change_nperiods = backend->can_set_period_size() && get_popdown_string_count (nperiods_combo) > 0; } } else { @@ -1996,7 +2425,8 @@ EngineControl::push_state_to_backend (bool start) /* determine if we need to stop the backend before changing parameters */ - if (change_driver || change_device || change_channels || change_latency || + if (change_driver || change_device || change_channels || change_nperiods || + (change_latency && !backend->can_change_systemic_latency_when_running ()) || (change_rate && !backend->can_change_sample_rate_when_running()) || change_midi || (change_bufsize && !backend->can_change_buffer_size_when_running())) { @@ -2005,35 +2435,15 @@ EngineControl::push_state_to_backend (bool start) restart_required = false; } - if (was_running) { - - if (!change_driver && !change_device && !change_channels && !change_latency && !change_midi) { - /* no changes in any parameters that absolutely require a - * restart, so check those that might be changeable without a - * restart - */ - - if (change_rate && !backend->can_change_sample_rate_when_running()) { - /* can't do this while running ... */ - restart_required = true; - } - - if (change_bufsize && !backend->can_change_buffer_size_when_running()) { - /* can't do this while running ... */ - restart_required = true; - } - } - } if (was_running) { if (restart_required) { - if (ARDOUR_UI::instance()->disconnect_from_engine ()) { + if (ARDOUR::AudioEngine::instance()->stop()) { return -1; } } } - if (change_driver && backend->set_driver (get_driver())) { error << string_compose (_("Cannot set driver to %1"), get_driver()) << endmsg; return -1; @@ -2061,6 +2471,10 @@ EngineControl::push_state_to_backend (bool start) error << string_compose (_("Cannot set buffer size to %1"), get_buffer_size()) << endmsg; return -1; } + if (change_nperiods && backend->set_peridod_size (get_nperiods())) { + error << string_compose (_("Cannot set periods to %1"), get_nperiods()) << endmsg; + return -1; + } if (change_channels || get_input_channels() == 0 || get_output_channels() == 0) { if (backend->set_input_channels (get_input_channels())) { @@ -2087,6 +2501,10 @@ EngineControl::push_state_to_backend (bool start) backend->set_midi_option (get_midi_option()); } + if (change_buffered_io) { + backend->set_use_buffered_io (use_buffered_io_button.get_active()); + } + if (1 /* TODO */) { for (vector::const_iterator p = _midi_devices.begin(); p != _midi_devices.end(); ++p) { if (_measure_midi) { @@ -2095,6 +2513,10 @@ EngineControl::push_state_to_backend (bool start) } else { backend->set_midi_device_enabled ((*p)->name, false); } + if (backend->can_change_systemic_latency_when_running ()) { + backend->set_systemic_midi_input_latency ((*p)->name, 0); + backend->set_systemic_midi_output_latency ((*p)->name, 0); + } continue; } backend->set_midi_device_enabled ((*p)->name, (*p)->enabled); @@ -2106,7 +2528,7 @@ EngineControl::push_state_to_backend (bool start) } if (start || (was_running && restart_required)) { - if (ARDOUR_UI::instance()->reconnect_to_engine()) { + if (ARDOUR::AudioEngine::instance()->start()) { return -1; } } @@ -2132,6 +2554,8 @@ EngineControl::post_push () store_state(state); } + states.sort (state_sort_cmp); + /* all off */ for (StateList::iterator i = states.begin(); i != states.end(); ++i) { @@ -2182,12 +2606,25 @@ EngineControl::get_buffer_size () const return samples; } +uint32_t +EngineControl::get_nperiods () const +{ + string txt = nperiods_combo.get_active_text (); + return atoi (txt.c_str()); +} + string EngineControl::get_midi_option () const { return midi_option_combo.get_active_text(); } +bool +EngineControl::get_use_buffered_io () const +{ + return use_buffered_io_button.get_active(); +} + uint32_t EngineControl::get_input_channels() const { @@ -2231,7 +2668,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 ""; @@ -2268,6 +2705,50 @@ EngineControl::control_app_button_clicked () backend->launch_control_app (); } +void +EngineControl::start_stop_button_clicked () +{ + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + + if (!backend) { + return; + } + + if (ARDOUR::AudioEngine::instance()->running()) { + ARDOUR::AudioEngine::instance()->stop (); + } else { + start_engine (); + } +} + +void +EngineControl::update_devices_button_clicked () +{ + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + + if (!backend) { + return; + } + + if (backend->update_devices()) { + device_list_changed (); + } +} + +void +EngineControl::use_buffered_io_button_clicked () +{ + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + + if (!backend) { + return; + } + + bool set_buffered_io = !use_buffered_io_button.get_active(); + use_buffered_io_button.set_active (set_buffered_io); + backend->set_use_buffered_io (set_buffered_io); +} + void EngineControl::manage_control_app_sensitivity () { @@ -2290,6 +2771,10 @@ void EngineControl::set_desired_sample_rate (uint32_t sr) { _desired_sample_rate = sr; + if (ARDOUR::AudioEngine::instance ()->running () + && ARDOUR::AudioEngine::instance ()->sample_rate () != sr) { + stop_engine (); + } device_changed (); } @@ -2298,13 +2783,11 @@ 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); - apply_button->set_sensitive (false); } if (page_num == midi_tab) { @@ -2316,8 +2799,7 @@ EngineControl::on_switch_page (GtkNotebookPage*, guint page_num) /* latency tab */ if (ARDOUR::AudioEngine::instance()->running()) { - // TODO - mark as 'stopped for latency - ARDOUR_UI::instance()->disconnect_from_engine (); + stop_engine (true); } { @@ -2373,6 +2855,13 @@ EngineControl::check_audio_latency_measurement () return true; } + if (mtdm->get_peak () > 0.707f) { + // get_peak() resets the peak-hold in the detector. + // this GUI callback is at 10Hz and so will be fine (test-signal is at higher freq) + lm_results.set_markup (string_compose (results_markup, _("Input signal is > -3dBFS. Lower the signal level (output gain, input gain) on the audio-interface."))); + return true; + } + if (mtdm->err () > 0.3) { mtdm->invert (); mtdm->resolve (); @@ -2530,6 +3019,13 @@ EngineControl::latency_button_clicked () } } +void +EngineControl::latency_back_button_clicked () +{ + ARDOUR::AudioEngine::instance()->stop(true); + notebook.set_current_page(0); +} + void EngineControl::use_latency_button_clicked () { @@ -2559,9 +3055,8 @@ EngineControl::use_latency_button_clicked () /* back to settings page */ notebook.set_current_page (0); -} } - +} bool EngineControl::on_delete_event (GdkEventAny* ev) @@ -2582,14 +3077,20 @@ EngineControl::engine_running () 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); + if (backend->can_set_period_size ()) { + set_active_text_if_present (nperiods_combo, nperiods_as_string (backend->period_size())); + } connect_disconnect_button.set_label (string_compose (_("Disconnect from %1"), backend->name())); connect_disconnect_button.show(); started_at_least_once = true; - engine_status.set_markup(string_compose ("%1", _("Active"))); + if (_have_control) { + engine_status.set_markup(string_compose ("%1", _("Running"))); + } else { + engine_status.set_markup(string_compose ("%1", _("Connected"))); + } + update_sensitivity(); } void @@ -2598,18 +3099,24 @@ 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(string_compose ("%1", _("Inactive"))); + if (_have_control) { + engine_status.set_markup(string_compose ("%1", _("Stopped"))); + } else { + engine_status.set_markup(X_("")); + } + + update_sensitivity(); } void EngineControl::device_list_changed () { + if (ignore_device_changes) { + return; + } PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); // ?? list_devices (); midi_option_changed(); @@ -2619,9 +3126,9 @@ void EngineControl::connect_disconnect_click() { if (ARDOUR::AudioEngine::instance()->running()) { - ARDOUR_UI::instance()->disconnect_from_engine (); + stop_engine (); } else { - ARDOUR_UI::instance()->reconnect_to_engine (); + start_engine (); } }