X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.h;h=fbe1486736008289c3ded60fb763f32d274a93a6;hb=9836cd39432d3b2258d2a016d4c8c9c30b2d5f2f;hp=e6ec7bcb505412ffe3c1e5cc3e49a8d481d69a97;hpb=a13a8da8ac977b247b7c8d8b4f2cfcddfc8996e7;p=ardour.git diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index e6ec7bcb50..fbe1486736 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -47,6 +47,8 @@ #include #include #include +#include +#include #include #include #include @@ -55,10 +57,8 @@ #include #include "gtkmm2ext/gtk_ui.h" -#include "gtkmm2ext/click_box.h" -#include "gtkmm2ext/stateful_button.h" -#include "gtkmm2ext/bindable_button.h" #include "gtkmm2ext/bindings.h" +#include "gtkmm2ext/visibility_tracker.h" #include "ardour/ardour.h" #include "ardour/types.h" @@ -69,12 +69,16 @@ #include "video_timeline.h" +#include "widgets/ardour_button.h" +#include "widgets/ardour_spacer.h" + #include "add_route_dialog.h" -#include "ardour_button.h" #include "ardour_dialog.h" #include "ardour_window.h" #include "editing.h" #include "enums.h" +#include "mini_timeline.h" +#include "shuttle_control.h" #include "visibility_group.h" #include "window_manager.h" @@ -86,9 +90,12 @@ #include "engine_dialog.h" #include "export_video_dialog.h" #include "global_port_matrix.h" +#include "idleometer.h" #include "keyeditor.h" #include "location_ui.h" +#include "lua_script_manager.h" #include "rc_option_editor.h" +#include "route_dialogs.h" #include "route_params_ui.h" #include "session_option_editor.h" #include "speaker_dialog.h" @@ -102,30 +109,31 @@ class EngineControl; class ExportVideoDialog; class KeyEditor; class LocationUIWindow; +class LuaScriptManager; class RCOptionEditor; class RouteParams_UI; class SessionOptionEditor; class SpeakerDialog; class GlobalPortMatrixWindow; +class IdleOMeter; #endif class VideoTimeLine; class ArdourKeyboard; class AudioClock; -class ButtonJoiner; class ConnectionEditor; class DuplicateRouteDialog; class MainClock; class Mixer_UI; -class ArdourPrompter; class PublicEditor; class SaveAsDialog; +class SaveTemplateDialog; class SessionDialog; -class SessionOptionEditor; -class ShuttleControl; +class SessionOptionEditorWindow; class Splash; class TimeInfoBox; class Meterbridge; +class LuaWindow; class MidiTracer; class NSM_Client; class LevelMeterHBox; @@ -145,9 +153,14 @@ namespace Gtk { class ProgressBar; } +namespace ArdourWidgets { + class Prompter; + class Tabbable; +} + class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr { - public: +public: ARDOUR_UI (int *argcp, char **argvp[], const char* localedir); ~ARDOUR_UI(); @@ -174,7 +187,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr int load_session (const std::string& path, const std::string& snapshot, std::string mix_template = std::string()); bool session_loaded; - int build_session (const std::string& path, const std::string& snapshot, ARDOUR::BusProfile&); + bool session_load_in_progress; + int build_session (const std::string& path, const std::string& snapshot, ARDOUR::BusProfile*); bool session_is_new() const { return _session_is_new; } ARDOUR::Session* the_session() { return _session; } @@ -182,7 +196,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr bool get_smart_mode () const; int get_session_parameters (bool quit_on_cancel, bool should_be_new = false, std::string load_template = ""); - int build_session_from_dialog (SessionDialog&, const std::string& session_name, const std::string& session_path); + int build_session_from_dialog (SessionDialog&, const std::string& session_name, const std::string& session_path); bool ask_about_loading_existing_session (const std::string& session_path); /// @return true if session was successfully unloaded. @@ -194,6 +208,12 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr static ARDOUR_UI *instance () { return theArdourUI; } + /* signal emitted when escape key is pressed. All UI components that + need to respond to Escape in some way (e.g. break drag, clear + selection, etc) should connect to and handle this. + */ + PBD::Signal0 Escape; + PublicEditor& the_editor() { return *editor;} Mixer_UI* the_mixer() { return mixer; } @@ -204,6 +224,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void toggle_monitor_section_visibility (); void toggle_keep_tearoffs(); + void reset_focus (Gtk::Widget*); + static PublicEditor* _instance; /** Emitted frequently with the audible frame, false, and the edit point as @@ -214,14 +236,15 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr static sigc::signal Clock; static void close_all_dialogs () { CloseAllDialogs(); } - static sigc::signal CloseAllDialogs; + static sigc::signal CloseAllDialogs; XMLNode* main_window_settings() const; XMLNode* editor_settings() const; + XMLNode* preferences_settings() const; XMLNode* mixer_settings () const; XMLNode* keyboard_settings () const; XMLNode* tearoff_settings (const char*) const; - + void save_ardour_state (); gboolean configure_handler (GdkEventConfigure* conf); @@ -236,8 +259,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void focus_on_clock (); AudioClock* big_clock; - TimeInfoBox* time_info_box; - VideoTimeLine *video_timeline; void store_clock_modes (); @@ -246,9 +267,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void synchronize_sync_source_and_video_pullup (); - void add_route (Gtk::Window* float_window); - void add_routes_part_two (); - void add_routes_thread (); + void add_route (); + void add_route_dialog_response (int); + + void add_routes_part_two (); + void add_routes_thread (); void start_duplicate_routes (); @@ -260,36 +283,24 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void flush_videotimeline_cache (bool localcacheonly=false); void export_video (bool range = false); - void session_add_audio_track ( - int input_channels, - int32_t output_channels, - ARDOUR::TrackMode mode, - ARDOUR::RouteGroup* route_group, - uint32_t how_many, - std::string const & name_template - ) { - - session_add_audio_route (true, input_channels, output_channels, mode, route_group, how_many, name_template); - } + void session_add_audio_route (bool, int32_t, int32_t, ARDOUR::TrackMode, ARDOUR::RouteGroup *, uint32_t, std::string const &, bool, ARDOUR::PresentationInfo::order_t order); - void session_add_audio_bus (int input_channels, int32_t output_channels, ARDOUR::RouteGroup* route_group, - uint32_t how_many, std::string const & name_template) { - session_add_audio_route (false, input_channels, output_channels, ARDOUR::Normal, route_group, how_many, name_template); - } + void session_add_mixed_track (const ARDOUR::ChanCount&, const ARDOUR::ChanCount&, ARDOUR::RouteGroup*, + uint32_t, std::string const &, bool strict_io, + ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord* pset, + ARDOUR::PresentationInfo::order_t order); - void session_add_midi_track (ARDOUR::RouteGroup* route_group, uint32_t how_many, std::string const & name_template, - ARDOUR::PluginInfoPtr instrument) { - session_add_midi_route (true, route_group, how_many, name_template, instrument); - } + void session_add_midi_bus (ARDOUR::RouteGroup*, uint32_t, std::string const &, bool strict_io, + ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord* pset, + ARDOUR::PresentationInfo::order_t order); - void session_add_mixed_track (const ARDOUR::ChanCount& input, const ARDOUR::ChanCount& output, ARDOUR::RouteGroup* route_group, uint32_t how_many, std::string const & name_template, - ARDOUR::PluginInfoPtr instrument); + void session_add_midi_route (bool, ARDOUR::RouteGroup *, uint32_t, std::string const &, bool, + ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord*, + ARDOUR::PresentationInfo::order_t order); - /*void session_add_midi_bus () { - session_add_midi_route (false); - }*/ + void display_insufficient_ports_message (); - void attach_to_engine (); + void attach_to_engine (); void post_engine (); gint exit_on_main_window_close (GdkEventAny *); @@ -313,7 +324,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void reset_route_peak_display (ARDOUR::Route*); void reset_group_peak_display (ARDOUR::RouteGroup*); - const std::string& announce_string() const { return _announce_string; } + const std::string& announce_string() const { return _announce_string; } void hide_application (); @@ -321,7 +332,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Gtk::Window& main_window () { return _main_window; } void setup_toplevel_window (Gtk::Window&, const std::string& name, void* owner); - + /* called from a static C function */ GtkNotebook* tab_window_root_drop (GtkNotebook* src, @@ -333,7 +344,13 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr bool tabbed_window_state_event_handler (GdkEventWindowState*, void* object); bool key_event_handler (GdkEventKey*, Gtk::Window* window); - protected: + Gtkmm2ext::ActionMap global_actions; + + ARDOUR::PresentationInfo::order_t translate_order (RouteDialogs::InsertAt); + + std::map route_setup_info (const std::string& script_path); + +protected: friend class PublicEditor; void toggle_auto_play (); @@ -343,17 +360,20 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr bool ignore_dual_punch; void toggle_punch_in (); void toggle_punch_out (); + void toggle_session_monitoring_in (); + void toggle_session_monitoring_disk (); void show_loop_punch_ruler_and_disallow_hide (); void reenable_hide_loop_punch_ruler_if_appropriate (); void toggle_auto_return (); void toggle_click (); - void toggle_audio_midi_setup (); + void toggle_audio_midi_setup (); void toggle_session_auto_loop (); void toggle_rc_options_window (); void toggle_session_options_window (); - private: +private: Gtk::Window _main_window; + Gtkmm2ext::VisibilityTracker* main_window_visibility; Gtk::VBox main_vpacker; Gtk::HBox status_bar_hpacker; Gtk::Notebook _tabs; @@ -362,20 +382,22 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Gtk::Tooltips _tooltips; NSM_Client* nsm; bool _was_dirty; - bool _mixer_on_top; - bool _initial_verbose_plugin_scan; + bool _mixer_on_top; + bool _initial_verbose_plugin_scan; bool first_time_engine_run; - bool tabs_button_event (GdkEventButton* ev); - - void show_tabbable (Gtkmm2ext::Tabbable*); - void hide_tabbable (Gtkmm2ext::Tabbable*); - void detach_tabbable (Gtkmm2ext::Tabbable*); - void attach_tabbable (Gtkmm2ext::Tabbable*); + void show_tabbable (ArdourWidgets::Tabbable*); + void hide_tabbable (ArdourWidgets::Tabbable*); + void detach_tabbable (ArdourWidgets::Tabbable*); + void attach_tabbable (ArdourWidgets::Tabbable*); + void button_change_tabbable_visibility (ArdourWidgets::Tabbable*); + void key_change_tabbable_visibility (ArdourWidgets::Tabbable*); + void toggle_editor_and_mixer (); + + void tabbable_state_change (ArdourWidgets::Tabbable&); - void tabbable_state_change (Gtkmm2ext::Tabbable&); - void toggle_meterbridge (); + void toggle_luawindow (); int setup_windows (); void setup_transport (); @@ -384,7 +406,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr static ARDOUR_UI *theArdourUI; SessionDialog *_session_dialog; - int starting (); + int starting (); int ask_about_saving_session (const std::vector& actions); @@ -396,7 +418,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void session_dirty_changed (); void update_title (); - + void map_transport_state (); int32_t do_engine_start (); @@ -408,7 +430,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void about_signal_response(int response); - Gtk::VBox top_packer; + Gtk::VBox top_packer; sigc::connection clock_signal_connection; void update_clocks (); @@ -422,37 +444,31 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr /* Transport Control */ + Gtk::Table transport_table; Gtk::Frame transport_frame; Gtk::HBox transport_hbox; - Gtk::Fixed transport_base; - Gtk::Fixed transport_button_base; - Gtk::Frame transport_button_frame; - Gtk::HBox transport_button_hbox; - Gtk::VBox transport_button_vbox; - Gtk::HBox transport_option_button_hbox; - Gtk::VBox transport_option_button_vbox; - Gtk::HBox transport_clock_hbox; - Gtk::VBox transport_clock_vbox; - Gtk::HBox primary_clock_hbox; - Gtk::HBox secondary_clock_hbox; + + ArdourWidgets::ArdourVSpacer* secondary_clock_spacer; + void repack_transport_hbox (); + void update_clock_visibility (); struct TransportControllable : public PBD::Controllable { - enum ToggleType { - Roll = 0, - Stop, - RecordEnable, - GotoStart, - GotoEnd, - AutoLoop, - PlaySelection, - }; - - TransportControllable (std::string name, ARDOUR_UI&, ToggleType); - void set_value (double, PBD::Controllable::GroupControlDisposition group_override); - double get_value (void) const; - - ARDOUR_UI& ui; - ToggleType type; + enum ToggleType { + Roll = 0, + Stop, + RecordEnable, + GotoStart, + GotoEnd, + AutoLoop, + PlaySelection, + }; + + TransportControllable (std::string name, ARDOUR_UI&, ToggleType); + void set_value (double, PBD::Controllable::GroupControlDisposition group_override); + double get_value (void) const; + + ARDOUR_UI& ui; + ToggleType type; }; boost::shared_ptr roll_controllable; @@ -468,37 +484,62 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void set_transport_controllable_state (const XMLNode&); XMLNode& get_transport_controllable_state (); - ArdourButton roll_button; - ArdourButton stop_button; - ArdourButton goto_start_button; - ArdourButton goto_end_button; - ArdourButton auto_loop_button; - ArdourButton play_selection_button; - ArdourButton rec_button; + ArdourWidgets::ArdourButton roll_button; + ArdourWidgets::ArdourButton stop_button; + ArdourWidgets::ArdourButton goto_start_button; + ArdourWidgets::ArdourButton goto_end_button; + ArdourWidgets::ArdourButton auto_loop_button; + ArdourWidgets::ArdourButton play_selection_button; + ArdourWidgets::ArdourButton rec_button; + ArdourWidgets::ArdourButton punch_in_button; + ArdourWidgets::ArdourButton punch_out_button; + ArdourWidgets::ArdourButton layered_button; + + ArdourWidgets::ArdourVSpacer recpunch_spacer; + ArdourWidgets::ArdourVSpacer monitoring_spacer; + + ArdourWidgets::ArdourButton monitor_in_button; + ArdourWidgets::ArdourButton monitor_disk_button; + ArdourWidgets::ArdourButton auto_input_button; + + Gtk::Label punch_label; + Gtk::Label layered_label; + + Gtk::Label punch_space; + Gtk::Label mon_space; void toggle_external_sync (); void toggle_time_master (); void toggle_video_sync (); - ShuttleControl* shuttle_box; + ShuttleControl shuttle_box; + MiniTimeline mini_timeline; + TimeInfoBox *time_info_box; - ArdourButton auto_return_button; - ArdourButton follow_edits_button; - ArdourButton auto_input_button; - ArdourButton click_button; - ArdourButton sync_button; + ArdourWidgets::ArdourButton auto_return_button; + ArdourWidgets::ArdourButton follow_edits_button; + ArdourWidgets::ArdourButton click_button; + ArdourWidgets::ArdourButton sync_button; - ArdourButton auditioning_alert_button; - ArdourButton solo_alert_button; - ArdourButton feedback_alert_button; - ArdourButton error_alert_button; + ArdourWidgets::ArdourButton auditioning_alert_button; + ArdourWidgets::ArdourButton solo_alert_button; + ArdourWidgets::ArdourButton feedback_alert_button; + ArdourWidgets::ArdourButton error_alert_button; + + ArdourWidgets::ArdourButton action_script_call_btn[10]; + Gtk::Table action_script_table; Gtk::VBox alert_box; Gtk::VBox meter_box; - LevelMeterHBox * editor_meter; - float editor_meter_max_peak; - ArdourButton editor_meter_peak_display; - bool editor_meter_peak_button_release (GdkEventButton*); + ArdourWidgets::ArdourButton editor_meter_peak_display; + LevelMeterHBox * editor_meter; + float editor_meter_max_peak; + bool editor_meter_peak_button_release (GdkEventButton*); + + bool editor_meter_button_press (GdkEventButton* ev); + void popup_editor_meter_menu (GdkEventButton* ev); + void add_editor_meter_type_item (Gtk::Menu_Helpers::MenuList&, Gtk::RadioMenuItem::Group&, std::string const &, ARDOUR::MeterType); + bool _suspend_editor_meter_callbacks; void blink_handler (bool); sigc::connection blink_connection; @@ -517,10 +558,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void _auditioning_changed (bool); bool solo_alert_press (GdkEventButton* ev); - bool audition_alert_press (GdkEventButton* ev); - bool feedback_alert_press (GdkEventButton *); + void audition_alert_clicked (); bool error_alert_press (GdkEventButton *); + void layered_button_clicked (); + void big_clock_value_changed (); void primary_clock_value_changed (); void secondary_clock_value_changed (); @@ -580,15 +622,17 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void open_session (); void open_recent_session (); - bool process_save_template_prompter (ArdourPrompter& prompter); + void save_template_dialog_response (int response, SaveTemplateDialog* d); void save_template (); + void manage_templates (); + + void meta_session_setup (const std::string& script_path); + void meta_route_setup (const std::string& script_path); void edit_metadata (); void import_metadata (); - void session_add_audio_route (bool, int32_t, int32_t, ARDOUR::TrackMode, ARDOUR::RouteGroup *, uint32_t, std::string const &); - void session_add_midi_route (bool, ARDOUR::RouteGroup *, uint32_t, std::string const &, ARDOUR::PluginInfoPtr); - + void set_loop_sensitivity (); void set_transport_sensitivity (bool); //stuff for ProTools-style numpad @@ -609,6 +653,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void transport_roll (); void transport_play_selection(); void transport_play_preroll(); + void transport_rec_preroll(); + void transport_rec_count_in(); void transport_forward (int option); void transport_rewind (int option); void transport_loop (); @@ -624,7 +670,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr guint32 last_key_press_time; - bool process_snapshot_session_prompter (ArdourPrompter& prompter, bool switch_to_it); + bool process_snapshot_session_prompter (ArdourWidgets::Prompter& prompter, bool switch_to_it); void snapshot_session (bool switch_to_it); void quick_snapshot_session (bool switch_to_it); //does not promtp for name, just makes a timestamped file @@ -633,45 +679,51 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr bool save_as_progress_update (float fraction, int64_t cnt, int64_t total, Gtk::Label* label, Gtk::ProgressBar* bar); void save_session_as (); + void archive_session (); void rename_session (); - void setup_order_hint (AddRouteDialog::InsertAt); int create_mixer (); int create_editor (); + int create_meterbridge (); + int create_luawindow (); + int create_masters (); Meterbridge *meterbridge; - int create_meterbridge (); + LuaWindow *luawindow; - /* Dialogs that can be created via new */ + /* Dialogs that can be created via new */ - RCOptionEditor* rc_option_editor; + RCOptionEditor* rc_option_editor; Gtk::HBox rc_option_editor_placeholder; - - WM::Proxy speaker_config_window; - WM::Proxy key_editor; - WM::Proxy add_route_dialog; - WM::Proxy about; - WM::Proxy location_ui; - WM::Proxy route_params; - WM::Proxy audio_midi_setup; - WM::Proxy export_video_dialog; - - /* Windows/Dialogs that require a creator method */ - - WM::ProxyWithConstructor session_option_editor; - WM::ProxyWithConstructor add_video_dialog; - WM::ProxyWithConstructor bundle_manager; - WM::ProxyWithConstructor big_clock_window; - WM::ProxyWithConstructor audio_port_matrix; - WM::ProxyWithConstructor midi_port_matrix; - - /* creator methods */ - - SessionOptionEditor* create_session_option_editor (); - BundleManager* create_bundle_manager (); - AddVideoDialog* create_add_video_dialog (); - BigClockWindow* create_big_clock_window(); - GlobalPortMatrixWindow* create_global_port_matrix (ARDOUR::DataType); + + WM::Proxy speaker_config_window; + WM::Proxy add_route_dialog; + WM::Proxy about; + WM::Proxy location_ui; + WM::Proxy route_params; + WM::Proxy audio_midi_setup; + WM::Proxy export_video_dialog; + WM::Proxy lua_script_window; + WM::Proxy idleometer; + + /* Windows/Dialogs that require a creator method */ + + WM::ProxyWithConstructor session_option_editor; + WM::ProxyWithConstructor add_video_dialog; + WM::ProxyWithConstructor bundle_manager; + WM::ProxyWithConstructor big_clock_window; + WM::ProxyWithConstructor audio_port_matrix; + WM::ProxyWithConstructor midi_port_matrix; + WM::ProxyWithConstructor key_editor; + + /* creator methods */ + + SessionOptionEditor* create_session_option_editor (); + BundleManager* create_bundle_manager (); + AddVideoDialog* create_add_video_dialog (); + BigClockWindow* create_big_clock_window(); + GlobalPortMatrixWindow* create_global_port_matrix (ARDOUR::DataType); + KeyEditor* create_key_editor (); ARDOUR::SystemExec *video_server_process; @@ -685,7 +737,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void install_actions (); - void toggle_record_enable (uint32_t); + void toggle_record_enable (uint16_t); uint32_t rec_enabled_streams; void count_recenabled_streams (ARDOUR::Route&); @@ -721,11 +773,12 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void plugin_scan_dialog (std::string type, std::string plugin, bool); void plugin_scan_timeout (int); - void session_format_mismatch (std::string, std::string); + void session_format_mismatch (std::string, std::string); void session_dialog (std::string); int pending_state_dialog (); int sr_mismatch_dialog (ARDOUR::framecnt_t, ARDOUR::framecnt_t); + void sr_mismatch_message (ARDOUR::framecnt_t, ARDOUR::framecnt_t); Gtk::MenuItem* jack_disconnect_item; Gtk::MenuItem* jack_reconnect_item; @@ -737,7 +790,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr std::vector positional_sync_strings; - void toggle_send_midi_feedback (); void toggle_use_mmc (); void toggle_send_mmc (); void toggle_send_mtc (); @@ -758,28 +810,27 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Glib::RefPtr ptag, Glib::RefPtr mtag, const char *msg); Gtk::Label status_bar_label; - bool status_bar_button_press (GdkEventButton*); + bool status_bar_button_press (GdkEventButton*); void loading_message (const std::string& msg); PBD::ScopedConnectionList forever_connections; - PBD::ScopedConnection halt_connection; - - void step_edit_status_change (bool); + PBD::ScopedConnection halt_connection; + PBD::ScopedConnection editor_meter_connection; - void platform_specific (); - void platform_setup (); + void step_edit_status_change (bool); - /* these are used only in response to a platform-specific "ShouldQuit" signal - */ + /* these are used only in response to a platform-specific "ShouldQuit" signal */ bool idle_finish (); void queue_finish (); void fontconfig_dialog (); - int missing_file (ARDOUR::Session*s, std::string str, ARDOUR::DataType type); - int ambiguous_file (std::string file, std::vector hits); + int missing_file (ARDOUR::Session*s, std::string str, ARDOUR::DataType type); + int ambiguous_file (std::string file, std::vector hits); bool click_button_clicked (GdkEventButton *); + bool click_button_scroll (GdkEventScroll *); + bool sync_button_clicked (GdkEventButton *); VisibilityGroup _status_bar_visibility; @@ -790,7 +841,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void feedback_detected (); - ArdourButton midi_panic_button; + ArdourWidgets::ArdourButton midi_panic_button; void midi_panic (); void successful_graph_sort (); @@ -809,10 +860,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr bool xrun_button_release (GdkEventButton* ev); - std::string _announce_string; - void check_announcements (); + std::string _announce_string; + void check_announcements (); - int do_audio_midi_setup (uint32_t); + int do_audio_midi_setup (uint32_t); void audioengine_became_silent (); DuplicateRouteDialog* duplicate_routes_dialog; @@ -820,18 +871,30 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void grab_focus_after_dialog (); void tabs_switch (GtkNotebookPage*, guint page_number); - void tabs_page_added (Gtk::Widget*, guint page_number); - void tabs_page_removed (Gtk::Widget*, guint page_number); + void tabs_page_added (Gtk::Widget*, guint); + void tabs_page_removed (Gtk::Widget*, guint); + ArdourWidgets::ArdourButton editor_visibility_button; + ArdourWidgets::ArdourButton mixer_visibility_button; + ArdourWidgets::ArdourButton prefs_visibility_button; + bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev, Gtkmm2ext::Bindings*); bool try_gtk_accel_binding (GtkWindow* win, GdkEventKey* ev, bool translate, GdkModifierType modifier); - + bool main_window_delete_event (GdkEventAny*); bool idle_ask_about_quit (); - Gtkmm2ext::ActionMap global_actions; - Gtkmm2ext::Bindings global_bindings; void load_bindings (); - + bool tabbable_visibility_button_press (GdkEventButton* ev, std::string const& tabbable_name); + + void step_up_through_tabs (); + void step_down_through_tabs (); + + void escape (); + void close_current_dialog (); + void pre_release_dialog (); + + bool bind_lua_action_script (GdkEventButton*, int); + void update_action_script_btn (int i, const std::string&); }; #endif /* __ardour_gui_h__ */