X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fengine_dialog.h;h=2f5399e564533bd013b1c7333f20d7b84d99f066;hb=103ef2ba08e59c21f84899450f04a062ac60334e;hp=303f6408282f4de9474a47779cef9503ec8c3d26;hpb=63ea7b6516dbd7554d1eff6c98de50cf61fc9a72;p=ardour.git diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h index 303f640828..2f5399e564 100644 --- a/gtk2_ardour/engine_dialog.h +++ b/gtk2_ardour/engine_dialog.h @@ -24,22 +24,25 @@ #include #include +#include +#include +#include +#include #include +#include +#include #include -#include #include -#include -#include -#include -#include #include "pbd/signals.h" +#include "widgets/ardour_button.h" + #include "ardour_dialog.h" -#include "ardour_button.h" -class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList { - public: +class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList +{ +public: EngineControl (); ~EngineControl (); @@ -51,7 +54,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList { void set_desired_sample_rate (uint32_t); bool try_autostart (); - private: +private: Gtk::Notebook notebook; Gtk::Label engine_status; @@ -83,31 +86,31 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList { Gtk::Adjustment ports_adjustment; Gtk::SpinButton ports_spinner; - Gtk::Label have_control_text; - ArdourButton control_app_button; - ArdourButton midi_devices_button; - ArdourButton start_stop_button; - ArdourButton update_devices_button; - ArdourButton use_buffered_io_button; + Gtk::Label have_control_text; + ArdourWidgets::ArdourButton control_app_button; + ArdourWidgets::ArdourButton midi_devices_button; + ArdourWidgets::ArdourButton start_stop_button; + ArdourWidgets::ArdourButton update_devices_button; + ArdourWidgets::ArdourButton use_buffered_io_button; Gtk::Button connect_disconnect_button; /* latency measurement */ - Gtk::ComboBoxText lm_output_channel_combo; - Gtk::ComboBoxText lm_input_channel_combo; - Gtk::Label lm_measure_label; - Gtk::Button lm_measure_button; - Gtk::Button lm_use_button; - Gtk::Button lm_back_button; - ArdourButton lm_button_audio; - Gtk::Label lm_title; - Gtk::Label lm_preamble; - Gtk::Label lm_results; - Gtk::Table lm_table; - Gtk::VBox lm_vbox; - bool have_lm_results; - bool lm_running; + Gtk::ComboBoxText lm_output_channel_combo; + Gtk::ComboBoxText lm_input_channel_combo; + Gtk::Label lm_measure_label; + Gtk::Button lm_measure_button; + Gtk::Button lm_use_button; + Gtk::Button lm_back_button; + ArdourWidgets::ArdourButton lm_button_audio; + Gtk::Label lm_title; + Gtk::Label lm_preamble; + Gtk::Label lm_results; + Gtk::Table lm_table; + Gtk::VBox lm_vbox; + bool have_lm_results; + bool lm_running; /* MIDI Tab */ @@ -182,17 +185,17 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList { void configure_midi_devices (); struct MidiDeviceSetting { - std::string name; - bool enabled; - uint32_t input_latency; - uint32_t output_latency; - - MidiDeviceSetting (std::string n, bool en = true, uint32_t inl = 0, uint32_t oul = 0) - : name (n) - , enabled (en) - , input_latency (inl) - , output_latency (oul) - {} + std::string name; + bool enabled; + uint32_t input_latency; + uint32_t output_latency; + + MidiDeviceSetting (std::string n, bool en = true, uint32_t inl = 0, uint32_t oul = 0) + : name (n) + , enabled (en) + , input_latency (inl) + , output_latency (oul) + {} }; typedef boost::shared_ptr MidiDeviceSettings; @@ -200,44 +203,44 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList { std::vector _midi_devices; MidiDeviceSettings find_midi_device(std::string devicename) const { - for (std::vector::const_iterator p = _midi_devices.begin(); p != _midi_devices.end(); ++p) { - if ((*p)->name == devicename) { - return *p; + for (std::vector::const_iterator p = _midi_devices.begin(); p != _midi_devices.end(); ++p) { + if ((*p)->name == devicename) { + return *p; + } } - } - return MidiDeviceSettings(); + return MidiDeviceSettings(); } struct StateStruct { - std::string backend; - std::string driver; - std::string device; - std::string input_device; - 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 midi_devices; - time_t lru; - - StateStruct() - : sample_rate (48000) - , buffer_size (1024) - , input_latency (0) - , output_latency (0) - , input_channels (0) - , output_channels (0) - , active (false) - , use_buffered_io (false) - , lru (0) {} - + std::string backend; + std::string driver; + std::string device; + std::string input_device; + 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 midi_devices; + time_t lru; + + StateStruct() + : sample_rate (48000) + , buffer_size (1024) + , input_latency (0) + , output_latency (0) + , input_channels (0) + , output_channels (0) + , active (false) + , use_buffered_io (false) + , lru (0) + {} }; typedef boost::shared_ptr State; @@ -345,7 +348,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList { MidiDeviceSettings _measure_midi; void midi_latency_adjustment_changed(Gtk::Adjustment *, MidiDeviceSettings, bool); - void midi_device_enabled_toggled(ArdourButton *, MidiDeviceSettings); + void midi_device_enabled_toggled(ArdourWidgets::ArdourButton *, MidiDeviceSettings); sigc::connection lm_back_button_signal; };