remove method and inline its contents. Nothing gained by wrapping this up

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 3962dc2945fd8b4c06b5f39304480a546d5b98a5..633cdd06a6756614e1a0077502718e0f448fb233 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -96,11 +96,13 @@
 #include "keyeditor.h"
 #include "location_ui.h"
 #include "lua_script_manager.h"
+#include "plugin_dspload_window.h"
 #include "rc_option_editor.h"
 #include "route_dialogs.h"
 #include "route_params_ui.h"
 #include "session_option_editor.h"
 #include "speaker_dialog.h"
+#include "transport_masters_dialog.h"
 #else
 class About;
 class AddRouteDialog;
@@ -119,6 +121,8 @@ class SessionOptionEditor;
 class SpeakerDialog;
 class GlobalPortMatrixWindow;
 class IdleOMeter;
+class PluginDSPLoadWindow;
+class TransportMastersWindow;
 #endif
 
 class VideoTimeLine;
@@ -161,6 +165,8 @@ namespace ArdourWidgets {
        class Tabbable;
 }
 
+#define MAX_LUA_ACTION_SCRIPTS 12
+
 class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr, public TransportControlProvider
 {
 public:
@@ -189,7 +195,6 @@ public:
        void finish();
 
        int load_session (const std::string& path, const std::string& snapshot, std::string mix_template = std::string());
-       bool session_loaded;
        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; }
@@ -226,8 +231,6 @@ public:
        void new_midi_tracer_window ();
        void toggle_editing_space();
        void toggle_mixer_space();
-       void toggle_mixer_list();
-       void toggle_monitor_section_visibility ();
        void toggle_keep_tearoffs();
 
        void reset_focus (Gtk::Widget*);
@@ -289,7 +292,8 @@ public:
        void flush_videotimeline_cache (bool localcacheonly=false);
        void export_video (bool range = false);
 
-       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_route (bool, int32_t, int32_t, ARDOUR::TrackMode, ARDOUR::RouteGroup *,
+                                     uint32_t, std::string const &, bool, ARDOUR::PresentationInfo::order_t order);
 
        void session_add_mixed_track (const ARDOUR::ChanCount&, const ARDOUR::ChanCount&, ARDOUR::RouteGroup*,
                                      uint32_t, std::string const &, bool strict_io,
@@ -304,6 +308,8 @@ public:
                                     ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord*,
                                     ARDOUR::PresentationInfo::order_t order);
 
+       void session_add_foldback_bus (uint32_t, std::string const &);
+
        void display_insufficient_ports_message ();
 
        void attach_to_engine ();
@@ -350,8 +356,6 @@ public:
        bool tabbed_window_state_event_handler (GdkEventWindowState*, void* object);
        bool key_event_handler (GdkEventKey*, Gtk::Window* window);
 
-       Gtkmm2ext::ActionMap global_actions;
-
        ARDOUR::PresentationInfo::order_t translate_order (RouteDialogs::InsertAt);
 
        std::map<std::string, std::string> route_setup_info (const std::string& script_path);
@@ -359,6 +363,11 @@ public:
 protected:
        friend class PublicEditor;
 
+       void toggle_use_monitor_section ();
+       void monitor_dim_all ();
+       void monitor_cut_all ();
+       void monitor_mono ();
+
        void toggle_auto_play ();
        void toggle_auto_input ();
        void toggle_punch ();
@@ -502,7 +511,7 @@ private:
        ArdourWidgets::ArdourButton feedback_alert_button;
        ArdourWidgets::ArdourButton error_alert_button;
 
-       ArdourWidgets::ArdourButton action_script_call_btn[10];
+       ArdourWidgets::ArdourButton action_script_call_btn[MAX_LUA_ACTION_SCRIPTS];
        Gtk::Table action_script_table;
 
        Gtk::VBox alert_box;
@@ -675,6 +684,8 @@ private:
        WM::Proxy<ExportVideoDialog> export_video_dialog;
        WM::Proxy<LuaScriptManager> lua_script_window;
        WM::Proxy<IdleOMeter> idleometer;
+       WM::Proxy<PluginDSPLoadWindow> plugin_dsp_load_window;
+       WM::Proxy<TransportMastersWindow> transport_masters_window;
 
        /* Windows/Dialogs that require a creator method */
 
@@ -850,7 +861,6 @@ private:
        bool main_window_delete_event (GdkEventAny*);
        bool idle_ask_about_quit ();
 
-       void load_bindings ();
        bool tabbable_visibility_button_press (GdkEventButton* ev, std::string const& tabbable_name);
 
        void step_up_through_tabs ();