#include "engine_dialog.h"
#include "gui_thread.h"
#include "utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace Gtk;
, 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)"))
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);
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
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 ()
{
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");
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();
}
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
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) ;
}
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;
XMLNode&
EngineControl::get_state ()
{
- LocaleGuard lg (X_("C"));
+ LocaleGuard lg;
XMLNode* root = new XMLNode ("AudioMIDISetup");
std::string path;
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);
{
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");
}
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;
}
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;
}
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 ();
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) {
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;
}
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 {
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) {
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
{
}
}
+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 ()
{
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 ();
}