X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fengine_dialog.cc;h=8a6c42fd8c79bdb11771d4463dcfe96322fa65b3;hb=refs%2Ftags%2F5.4;hp=ef19aa871446c282c6f8c38d892c0ecb4162009a;hpb=fed6c9f3adef6e77055f6ef2d767869bbf40d348;p=ardour.git

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index ef19aa8714..8a6c42fd8c 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -53,7 +53,7 @@
 #include "engine_dialog.h"
 #include "gui_thread.h"
 #include "utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -87,6 +87,7 @@ EngineControl::EngineControl ()
 	, 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)"))
@@ -96,6 +97,7 @@ 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)
@@ -262,7 +264,6 @@ 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);
 
@@ -281,6 +282,11 @@ EngineControl::EngineControl ()
 	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);
 	ok_button = add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
 
@@ -301,13 +307,18 @@ EngineControl::EngineControl ()
 		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
@@ -412,6 +423,18 @@ 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 ()
 {
@@ -503,6 +526,7 @@ EngineControl::build_notebook ()
 
 	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");
@@ -649,13 +673,7 @@ EngineControl::build_full_control_notebook ()
 	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++;
 }
 
@@ -834,11 +852,17 @@ EngineControl::update_sensitivity ()
 	}
 
 	if (get_popdown_string_count (sample_rate_combo) > 0) {
+		bool allow_to_set_rate = false;
 		if (!ARDOUR::AudioEngine::instance()->running()) {
-			sample_rate_combo.set_sensitive (true);
-		} else {
-			sample_rate_combo.set_sensitive (false);
+			if (!ARDOUR_UI::instance()->session_loaded) {
+				// engine is not running, no session loaded -> anything goes.
+				allow_to_set_rate = true;
+			} else if (_desired_sample_rate > 0 && get_rate () != _desired_sample_rate) {
+				// only allow to change if the current setting is not the native session rate.
+				allow_to_set_rate = true;
+			}
 		}
+		sample_rate_combo.set_sensitive (allow_to_set_rate);
 	} else {
 		sample_rate_combo.set_sensitive (false);
 		valid = false;
@@ -860,18 +884,27 @@ EngineControl::update_sensitivity ()
 		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();
 	}
@@ -1365,7 +1398,10 @@ EngineControl::set_samplerate_popdown_strings ()
 	set_popdown_strings (sample_rate_combo, s);
 
 	if (!s.empty()) {
-		if (desired.empty ()) {
+		if (ARDOUR::AudioEngine::instance()->running()) {
+			sample_rate_combo.set_active_text (rate_as_string (backend->sample_rate()));
+		}
+		else if (desired.empty ()) {
 			float new_active_sr = backend->default_sample_rate ();
 
 			if (std::find (sr.begin (), sr.end (), new_active_sr) == sr.end ()) {
@@ -1569,12 +1605,7 @@ EngineControl::output_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[64];
-	snprintf (buf, sizeof (buf), "%u %s", sz, P_("sample", "samples", sz));
-	return buf;
+	return string_compose (P_("%1 sample", "%1 samples", sz), sz);
 }
 
 string
@@ -1675,9 +1706,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 ();
 	}
 }
 
@@ -1829,6 +1860,7 @@ EngineControl::store_state (State state)
 	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) ;
 }
 
@@ -1858,6 +1890,8 @@ 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;
@@ -1870,7 +1904,7 @@ EngineControl::maybe_display_saved_state ()
 XMLNode&
 EngineControl::get_state ()
 {
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg;
 
 	XMLNode* root = new XMLNode ("AudioMIDISetup");
 	std::string path;
@@ -1895,6 +1929,7 @@ EngineControl::get_state ()
 			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);
 
@@ -1939,11 +1974,9 @@ EngineControl::set_state (const XMLNode& root)
 {
 	XMLNodeList          clist, cclist;
 	XMLNodeConstIterator citer, cciter;
-	XMLNode* child;
-	XMLNode* grandchild;
-	XMLProperty* prop = NULL;
-
-	fprintf (stderr, "EngineControl::set_state\n");
+	XMLNode const * child;
+	XMLNode const * grandchild;
+	XMLProperty const * prop = NULL;
 
 	if (root.name() != "AudioMIDISetup") {
 		return false;
@@ -2039,6 +2072,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;
 			}
@@ -2206,12 +2244,15 @@ EngineControl::set_current_state (const State& state)
 	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));
+	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));
 	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;
 }
 
@@ -2220,6 +2261,7 @@ EngineControl::push_state_to_backend (bool start)
 {
 	DEBUG_ECONTROL ("push_state_to_backend");
 	boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+	PBD::Unwinder<uint32_t> protect_ignore_device_changes (ignore_device_changes, ignore_device_changes + 1);
 
 	if (!backend) {
 		return 0;
@@ -2237,6 +2279,7 @@ EngineControl::push_state_to_backend (bool start)
 	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 ();
@@ -2287,6 +2330,12 @@ EngineControl::push_state_to_backend (bool start)
 				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) {
@@ -2322,6 +2371,8 @@ EngineControl::push_state_to_backend (bool start)
 			change_channels = true;
 			change_latency = true;
 			change_midi = true;
+			change_buffered_io = backend->can_use_buffered_io();
+			change_channels = true;
 			change_nperiods = backend->can_set_period_size() && get_popdown_string_count (nperiods_combo) > 0;
 		}
 
@@ -2383,7 +2434,7 @@ EngineControl::push_state_to_backend (bool start)
 	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_midi || change_buffered_io ||
 			(change_bufsize && !backend->can_change_buffer_size_when_running())) {
 		restart_required = true;
 	} else {
@@ -2456,6 +2507,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<MidiDeviceSettings>::const_iterator p = _midi_devices.begin(); p != _midi_devices.end(); ++p) {
 			if (_measure_midi) {
@@ -2570,6 +2625,12 @@ 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
 {
@@ -2680,6 +2741,20 @@ EngineControl::update_devices_button_clicked ()
 	}
 }
 
+void
+EngineControl::use_buffered_io_button_clicked ()
+{
+	boost::shared_ptr<ARDOUR::AudioBackend> 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 ()
 {
@@ -2702,6 +2777,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 ();
 }
 
@@ -2782,6 +2861,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 ();
@@ -3034,6 +3120,9 @@ EngineControl::engine_stopped ()
 void
 EngineControl::device_list_changed ()
 {
+	if (ignore_device_changes) {
+		return;
+	}
 	PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1); // ??
 	list_devices ();
 	midi_option_changed();