#include <boost/scoped_ptr.hpp>
-#include <gtkmm/messagedialog.h>
-
#include "pbd/error.h"
#include "pbd/locale_guard.h"
#include "pbd/xml++.h"
#include <gtkmm/notebook.h>
#include <gtkmm2ext/utils.h>
+#include "widgets/tooltips.h"
+
#include "ardour/audio_backend.h"
#include "ardour/audioengine.h"
#include "ardour/mtdm.h"
#include "opts.h"
#include "debug.h"
+#include "ardour_message.h"
#include "ardour_ui.h"
#include "engine_dialog.h"
#include "gui_thread.h"
, start_stop_button (_("Stop"))
, update_devices_button (_("Refresh Devices"))
, use_buffered_io_button (_("Use Buffered I/O"), ArdourButton::led_default_elements)
+ , try_autostart_button (_("Autostart"), ArdourButton::led_default_elements)
, lm_measure_label (_("Measure"))
, lm_use_button (_("Use results"))
, lm_back_button (_("Back to settings ... (ignore results)"))
vector<const ARDOUR::AudioBackendInfo*> backends = ARDOUR::AudioEngine::instance()->available_backends();
if (backends.empty()) {
- MessageDialog msg (string_compose (_("No audio/MIDI backends detected. %1 cannot run\n\n(This is a build/packaging/system error. It should never happen.)"), PROGRAM_NAME));
+ ArdourMessageDialog msg (string_compose (_("No audio/MIDI backends detected. %1 cannot run\n\n(This is a build/packaging/system error. It should never happen.)"), PROGRAM_NAME));
msg.run ();
throw failed_constructor ();
}
use_buffered_io_button.set_name ("generic button");
use_buffered_io_button.set_can_focus(true);
+ try_autostart_button.signal_clicked.connect (mem_fun (*this, &EngineControl::try_autostart_button_clicked));
+ try_autostart_button.set_name ("generic button");
+ try_autostart_button.set_can_focus(true);
+ config_parameter_changed ("try-autostart-engine");
+ set_tooltip (try_autostart_button,
+ string_compose (_("Always try these settings when starting %1, if the same device is available"), PROGRAM_NAME));
+
+ ARDOUR::Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&EngineControl::config_parameter_changed, this, _1), gui_context());
+
/* Pick up any existing audio setup configuration, if appropriate */
XMLNode* audio_setup = ARDOUR::Config->extra_xml ("AudioMIDISetup");
connect_disconnect_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::connect_disconnect_click));
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
ArdourDialog::on_map ();
}
-bool
-EngineControl::try_autostart ()
+void
+EngineControl::config_parameter_changed (std::string const & p)
{
- if (!start_stop_button.get_sensitive()) {
- return false;
- }
- if (ARDOUR::AudioEngine::instance()->running()) {
- return true;
+ if (p == "try-autostart-engine") {
+ try_autostart_button.set_active (ARDOUR::Config->get_try_autostart_engine ());
}
- return start_engine ();
}
bool
EngineControl::start_engine ()
{
- if (push_state_to_backend(true) != 0) {
- MessageDialog msg(*this,
- ARDOUR::AudioEngine::instance()->get_last_backend_error());
+ if (push_state_to_backend (true) != 0) {
+ ArdourMessageDialog msg (*this, ARDOUR::AudioEngine::instance()->get_last_backend_error());
msg.run();
return false;
}
EngineControl::stop_engine (bool for_latency)
{
if (ARDOUR::AudioEngine::instance()->stop(for_latency)) {
- MessageDialog msg(*this,
- ARDOUR::AudioEngine::instance()->get_last_backend_error());
+ ArdourMessageDialog msg(*this, ARDOUR::AudioEngine::instance()->get_last_backend_error());
msg.run();
return false;
}
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");
vector<string> strings;
AttachOptions xopt = AttachOptions (FILL|EXPAND);
int row = 1; // row zero == backend combo
+ int btn = 1; // row zero == start_stop_button
+ bool autostart_packed = false;
/* start packing it up */
output_device_combo.set_active_text ("");
}
+ /* same line as Driver */
+ if (backend->can_use_buffered_io()) {
+ basic_packer.attach (use_buffered_io_button, 3, 4, btn, btn + 1, xopt, xopt);
+ btn++;
+ }
+
+ /* same line as Device(s) */
+ if (backend->can_request_update_devices()) {
+ basic_packer.attach (update_devices_button, 3, 4, btn, btn + 1, xopt, xopt);
+ btn++;
+ }
+
+ /* prefer "try autostart" below "Start" if possible */
+ if (btn < row) {
+ basic_packer.attach (try_autostart_button, 3, 4, btn, btn + 1, xopt, xopt);
+ btn++;
+ autostart_packed = true;
+ }
+
label = manage (left_aligned_label (_("Sample rate:")));
basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
basic_packer.attach (sample_rate_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0);
row++;
-
label = manage (left_aligned_label (_("Buffer size:")));
basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
basic_packer.attach (buffer_size_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0);
++ctrl_btn_span;
}
- /* button spans 2 or 3 rows */
-
+ /* button spans 2 or 3 rows: Sample rate, Buffer size, Periods */
basic_packer.attach (control_app_button, 3, 4, row - ctrl_btn_span, row + 1, xopt, xopt);
row++;
++row;
}
+ /* Prefere next available vertical slot, 1 row */
+ if (btn < row && !autostart_packed) {
+ basic_packer.attach (try_autostart_button, 3, 4, btn, btn + 1, xopt, xopt);
+ btn++;
+ autostart_packed = true;
+ }
+
input_latency.set_name ("InputLatency");
input_latency.set_flags (Gtk::CAN_FOCUS);
input_latency.set_digits (0);
basic_packer.attach (midi_option_combo, 1, 2, row, row + 1, SHRINK, (AttachOptions) 0);
basic_packer.attach (midi_devices_button, 3, 4, row, row+1, xopt, xopt);
row++;
+
+ if (!autostart_packed) {
+ basic_packer.attach (try_autostart_button, 3, 4, row, row+1, xopt, xopt);
+ }
}
void
ARDOUR::AudioEngine::instance()->get_physical_inputs (type, inputs);
if (!ARDOUR::AudioEngine::instance()->running()) {
- MessageDialog msg (_("Failed to start or connect to audio-engine.\n\nLatency calibration requires a working audio interface."));
+ ArdourMessageDialog msg (_("Failed to start or connect to audio-engine.\n\nLatency calibration requires a working audio interface."));
notebook.set_current_page (0);
msg.run ();
return;
}
else if (inputs.empty() || outputs.empty()) {
- MessageDialog msg (_("Your selected audio configuration is playback- or capture-only.\n\nLatency calibration requires playback and capture"));
+ ArdourMessageDialog msg (_("Your selected audio configuration is playback- or capture-only.\n\nLatency calibration requires playback and capture"));
notebook.set_current_page (0);
msg.run ();
return;
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);
+ update_devices_button.set_sensitive (backend->can_request_update_devices ());
+ use_buffered_io_button.set_sensitive (backend->can_use_buffered_io ());
}
} 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();
}
m = manage (new ArdourButton ((*p)->name, ArdourButton::led_default_elements));
m->set_name ("midi device");
- m->set_can_focus (Gtk::CAN_FOCUS);
+ m->set_can_focus (true);
m->add_events (Gdk::BUTTON_RELEASE_MASK);
m->set_active (enabled);
m->signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &EngineControl::midi_device_enabled_toggled), m, *p));
_midi_devices = new_devices;
if (_midi_devices.empty()) {
- midi_devices_button.hide ();
+ midi_devices_button.set_sensitive (false);
} else {
- midi_devices_button.show ();
+ midi_devices_button.set_sensitive (true);
}
}
boost::shared_ptr<ARDOUR::AudioBackend> backend;
- if (!(backend = ARDOUR::AudioEngine::instance ()->set_backend (
- state->backend, downcase (std::string(PROGRAM_NAME)), ""))) {
+ 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.
backend->launch_control_app ();
}
+void
+EngineControl::on_response (int r)
+{
+ /* Do not run ArdourDialog::on_response() which will hide us. Leave
+ * that to whoever invoked us, if they wish to hide us after "start".
+ *
+ * StartupFSM does hide us after response(); Window > Audio/MIDI Setup
+ * does not.
+ */
+ pop_splash ();
+ Gtk::Dialog::on_response (r);
+}
+
void
EngineControl::start_stop_button_clicked ()
{
if (ARDOUR::AudioEngine::instance()->running()) {
ARDOUR::AudioEngine::instance()->stop ();
} else {
- if (!ARDOUR_UI::instance()->the_session ()) {
- pop_splash ();
- hide ();
- ARDOUR::GUIIdle ();
- }
+ /* whoever displayed this dialog is expected to do its own
+ check on whether or not the engine is running.
+ */
start_engine ();
- if (!ARDOUR_UI::instance()->the_session ()) {
- ArdourDialog::on_response (RESPONSE_OK);
- }
}
+
+ response (RESPONSE_OK);
}
void
}
}
+void
+EngineControl::try_autostart_button_clicked ()
+{
+ ARDOUR::Config->set_try_autostart_engine (!try_autostart_button.get_active ());
+ try_autostart_button.set_active (ARDOUR::Config->get_try_autostart_engine ());
+}
+
void
EngineControl::use_buffered_io_button_clicked ()
{
EngineControl::set_desired_sample_rate (uint32_t sr)
{
_desired_sample_rate = sr;
- if (ARDOUR::AudioEngine::instance ()->running ()
- && ARDOUR::AudioEngine::instance ()->sample_rate () != sr) {
+
+ if (ARDOUR::AudioEngine::instance ()->running () && ARDOUR::AudioEngine::instance ()->sample_rate () != sr) {
stop_engine ();
}
+
device_changed ();
}
bool
EngineControl::on_delete_event (GdkEventAny* ev)
{
- if (notebook.get_current_page() == 2) {
- /* currently on latency tab - be sure to clean up */
+ if (lm_running || notebook.get_current_page() == 2) {
+ /* currently measuring latency - be sure to clean up */
end_latency_detection ();
}
+
return ArdourDialog::on_delete_event (ev);
}
}
start_engine ();
if (!ARDOUR_UI::instance()->the_session ()) {
- ArdourDialog::on_response (RESPONSE_OK);
+ ArdourDialog::response (RESPONSE_OK);
}
}
}
projects / ardour.git / blobdiff