enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / gtk2_ardour / engine_dialog.cc

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 762d1620d5aaeec55fb47db9fc3f07209a44d4e7..cf1d3b0d36eee0ee1efd76140d6ecc28744b228a 100644 (file)
--- 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;
@@ -307,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
@@ -418,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 ()
 {
@@ -1579,12 +1596,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
@@ -1883,7 +1895,7 @@ EngineControl::maybe_display_saved_state ()
 XMLNode&
 EngineControl::get_state ()
 {
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
 
        XMLNode* root = new XMLNode ("AudioMIDISetup");
        std::string path;
@@ -1953,9 +1965,9 @@ 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");
 
@@ -2350,6 +2362,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;
                }
 
@@ -2411,7 +2425,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 {
@@ -2754,6 +2768,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 ();
 }