meterbridge: don't include disk/input buttons on busses; fixes #5935

[ardour.git] / gtk2_ardour / engine_dialog.h

diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h
index fcbdfe4cb8e0dff70e43b6803d0d70b73e6c593e..6d10eb76ac7b7264d7b62009770ddb034e77338b 100644 (file)
--- a/gtk2_ardour/engine_dialog.h
+++ b/gtk2_ardour/engine_dialog.h
@@ -36,6 +36,7 @@
 #include "pbd/signals.h"
 
 #include "ardour_dialog.h"
+#include "ardour_button.h"
 
 class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
   public:
@@ -62,6 +63,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     Gtk::ComboBoxText driver_combo;
     Gtk::ComboBoxText device_combo;
     Gtk::ComboBoxText sample_rate_combo;
+    Gtk::ComboBoxText midi_option_combo;
     Gtk::ComboBoxText buffer_size_combo;
     Gtk::Label        buffer_size_duration_label;
     Gtk::Adjustment input_latency_adjustment;
@@ -75,20 +77,26 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     Gtk::Adjustment ports_adjustment;
     Gtk::SpinButton ports_spinner;
 
+    Gtk::Label      have_control_text;
     Gtk::Button     control_app_button;
 
+    Gtk::Button     connect_disconnect_button;
+
     /* latency measurement */
 
     Gtk::ComboBoxText lm_output_channel_combo;
     Gtk::ComboBoxText lm_input_channel_combo;
-    Gtk::Label        lm_start_stop_label;
-    Gtk::ToggleButton lm_measure_button;
+    Gtk::Label        lm_measure_label;
+    Gtk::Button       lm_measure_button;
     Gtk::Button       lm_use_button;
+    Gtk::Button       lm_back_button;
+    ArdourButton      lm_button;
     Gtk::Label        lm_title;
     Gtk::Label        lm_results;
     Gtk::Table        lm_table;
     Gtk::VBox         lm_vbox;
     bool              have_lm_results;
+    bool              lm_running;
 
     Gtk::Button* cancel_button;
     Gtk::Button* ok_button;
@@ -106,20 +114,19 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     
     uint32_t ignore_changes;
     uint32_t _desired_sample_rate;
-    
-    static bool engine_running ();
-    
+    bool     started_at_least_once;
+
     void driver_changed ();
     void backend_changed ();
     void sample_rate_changed ();
     void buffer_size_changed ();
     void parameter_changed ();
+    void midi_option_changed ();
 
     void setup_midi_tab_for_backend ();
     void setup_midi_tab_for_jack ();
     void refresh_midi_display ();
     
-    std::string rate_as_string (float);
     std::string bufsize_as_string (uint32_t);
 
     float get_rate() const;
@@ -131,6 +138,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     std::string get_device_name() const;
     std::string get_driver() const;
     std::string get_backend() const;
+    std::string get_midi_option () const;
 
     void device_changed ();
     void list_devices ();
@@ -147,6 +155,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
        uint32_t input_channels;
        uint32_t output_channels;
        bool active;
+       std::string midi_option;
 
        State() 
                : input_latency (0)
@@ -174,6 +183,8 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     static bool print_channel_count (Gtk::SpinButton*);
 
     void build_notebook ();
+    void build_full_control_notebook ();
+    void build_no_control_notebook ();
 
     void on_response (int);
     void control_app_button_clicked ();
@@ -181,18 +192,27 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     void manage_control_app_sensitivity ();
     int push_state_to_backend (bool start);
     void post_push ();
+    void update_sensitivity ();
 
     /* latency measurement */
-    void latency_button_toggled ();
+    void latency_button_clicked ();
     bool check_latency_measurement ();
     sigc::connection latency_timeout;
     void enable_latency_tab ();
     void disable_latency_tab ();
     void start_latency_detection ();
     void end_latency_detection ();
-
+    
     void on_switch_page (GtkNotebookPage*, guint page_num);
     bool on_delete_event (GdkEventAny*);
+
+    void engine_running ();
+    void engine_stopped ();
+    PBD::ScopedConnection running_connection;
+    PBD::ScopedConnection stopped_connection;
+
+    void connect_disconnect_click ();
+    void calibrate_latency ();
 };
 
 #endif /* __gtk2_ardour_engine_dialog_h__ */