X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fengine_dialog.h;h=8f47f2b5a35d3668cc7c5f4adf0f7754999e13bf;hb=d5f55246cc9d1922bfdaf144aaad083f20e49064;hp=783ab440e80e272c7158e322c732b71818fbe68e;hpb=52c25cab36b26755cf7e4fdaf4d55f383b5fa90a;p=ardour.git

diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h
index 783ab440e8..8f47f2b5a3 100644
--- a/gtk2_ardour/engine_dialog.h
+++ b/gtk2_ardour/engine_dialog.h
@@ -49,6 +49,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     bool set_state (const XMLNode&);
 
     void set_desired_sample_rate (uint32_t);
+    bool try_autostart ();
 
   private:
     Gtk::Notebook notebook;
@@ -70,6 +71,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     Gtk::ComboBoxText midi_option_combo;
     Gtk::ComboBoxText buffer_size_combo;
     Gtk::Label        buffer_size_duration_label;
+    Gtk::ComboBoxText nperiods_combo;
     Gtk::Adjustment input_latency_adjustment;
     Gtk::SpinButton input_latency;
     Gtk::Adjustment output_latency_adjustment;
@@ -84,7 +86,9 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     Gtk::Label      have_control_text;
     ArdourButton    control_app_button;
     ArdourButton    midi_devices_button;
-    ArdourButton    stop_engine_button;
+    ArdourButton    start_stop_button;
+    ArdourButton    update_devices_button;
+    ArdourButton    use_buffered_io_button;
 
     Gtk::Button     connect_disconnect_button;
 
@@ -107,7 +111,6 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
 
     Gtk::Button* cancel_button;
     Gtk::Button* ok_button;
-    Gtk::Button* apply_button;
 
     /* MIDI Tab */
 
@@ -119,7 +122,8 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
 
     Gtk::CheckButton aj_button;
 
-    uint32_t ignore_changes;
+    uint32_t ignore_changes; // state save/load
+    uint32_t ignore_device_changes; // AudioEngine::DeviceListChanged
     uint32_t _desired_sample_rate;
     bool     started_at_least_once;
     bool     queue_device_changed;
@@ -128,6 +132,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     void backend_changed ();
     void sample_rate_changed ();
     void buffer_size_changed ();
+    void nperiods_changed ();
     void parameter_changed ();
     void midi_option_changed ();
 
@@ -137,7 +142,8 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
 
 	void update_midi_options ();
 
-    std::string bufsize_as_string (uint32_t);
+	std::string bufsize_as_string (uint32_t);
+	std::string nperiods_as_string (uint32_t);
 
 	std::vector<float> get_default_sample_rates ();
 	std::vector<uint32_t> get_default_buffer_sizes ();
@@ -147,6 +153,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
 
     float get_rate() const;
     uint32_t get_buffer_size() const;
+    uint32_t get_nperiods() const;
     uint32_t get_input_channels() const;
     uint32_t get_output_channels() const;
     uint32_t get_input_latency() const;
@@ -157,6 +164,10 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     std::string get_driver() const;
     std::string get_backend() const;
     std::string get_midi_option () const;
+    bool get_use_buffered_io () const;
+
+	std::string get_default_device (const std::string&,
+	                                const std::vector<std::string>&);
 
     void device_changed ();
     void input_device_changed ();
@@ -167,6 +178,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     bool set_output_device_popdown_strings ();
     void set_samplerate_popdown_strings ();
     void set_buffersize_popdown_strings ();
+    void set_nperiods_popdown_strings ();
     void list_devices ();
     void show_buffer_duration ();
 
@@ -207,13 +219,16 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
 	std::string output_device;
 	float sample_rate;
 	uint32_t buffer_size;
+	uint32_t n_periods;
 	uint32_t input_latency;
 	uint32_t output_latency;
 	uint32_t input_channels;
 	uint32_t output_channels;
 	bool active;
+	bool use_buffered_io;
 	std::string midi_option;
 	std::vector<MidiDeviceSettings> midi_devices;
+	time_t lru;
 
 	StateStruct()
 		: sample_rate (48000)
@@ -222,15 +237,19 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
 		, output_latency (0)
 		, input_channels (0)
 		, output_channels (0)
-		, active (false) {}
+		, active (false)
+		, use_buffered_io (false)
+		, lru (0) {}
 
     };
 
     typedef boost::shared_ptr<StateStruct> State;
     typedef std::list<State> StateList;
+    static bool state_sort_cmp (const State &a, const State &b);
 
     StateList states;
 
+    State get_matching_state (const std::string& backend);
     State get_matching_state (const std::string& backend,
 			       const std::string& driver,
 			       const std::string& device);
@@ -277,6 +296,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
 	sigc::connection driver_combo_connection;
 	sigc::connection sample_rate_combo_connection;
 	sigc::connection buffer_size_combo_connection;
+	sigc::connection nperiods_combo_connection;
 	sigc::connection device_combo_connection;
 	sigc::connection input_device_combo_connection;
 	sigc::connection output_device_combo_connection;
@@ -289,15 +309,20 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     void on_show ();
     void on_response (int);
     void control_app_button_clicked ();
-    void stop_engine_button_clicked ();
+    void start_stop_button_clicked ();
+    void update_devices_button_clicked ();
+    void use_buffered_io_button_clicked ();
     void use_latency_button_clicked ();
     void manage_control_app_sensitivity ();
     int push_state_to_backend (bool start);
     void post_push ();
     void update_sensitivity ();
+	bool start_engine ();
+	bool stop_engine (bool for_latency = false);
 
     /* latency measurement */
     void latency_button_clicked ();
+    void latency_back_button_clicked ();
     bool check_audio_latency_measurement ();
     bool check_midi_latency_measurement ();
     sigc::connection latency_timeout;