OSC: Changed gainVCA to gainfader as VCA is already used.

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index b9521218afa39fe54861203188e6006f531cc5f0..5778a3cbbbb40d64e9b9ab51727a1d008418de03 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -143,7 +143,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        ARDOUR::Session* session() const { return _session; }
 
        Gtk::Window* use_own_window (bool and_fill_it);
-       
+
        void             first_idle ();
        virtual bool     have_idled () const { return _have_idled; }
 
@@ -274,8 +274,11 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        /* analysis window */
 
-       void analyze_region_selection();
-       void analyze_range_selection();
+       void loudness_analyze_region_selection();
+       void loudness_analyze_range_selection();
+
+       void spectral_analyze_region_selection();
+       void spectral_analyze_range_selection();
 
        /* export */
 
@@ -349,7 +352,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void set_summary ();
        void set_group_tabs ();
        void toggle_measure_visibility ();
-       void toggle_logo_visibility ();
 
        /* fades */
 
@@ -550,7 +552,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void color_handler ();
 
        bool                 constructed;
-       Gtkmm2ext::Bindings  key_bindings;
 
        // to keep track of the playhead position for control_scroll
        boost::optional<framepos_t> _control_scroll_target;
@@ -635,6 +636,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void remove_marker (ArdourCanvas::Item&, GdkEvent*);
        gint really_remove_marker (ARDOUR::Location* loc);
        void goto_nth_marker (int nth);
+       void trigger_script (int nth);
        void toggle_marker_lines ();
        void set_marker_line_visibility (bool);
 
@@ -808,8 +810,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        Gtk::EventBox             time_bars_event_box;
        Gtk::VBox                 time_bars_vbox;
 
-       ArdourCanvas::Pixbuf     *logo_item;
-
        ArdourCanvas::Container      *tempo_group;
        ArdourCanvas::Container      *meter_group;
        ArdourCanvas::Container      *marker_group;
@@ -1174,7 +1174,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void register_region_actions ();
 
        void load_bindings ();
-       Gtkmm2ext::ActionMap editor_action_map;
 
        /* CUT/COPY/PASTE */
 
@@ -1275,7 +1274,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        void naturalize_region ();
 
-       void reset_focus ();
+       void reset_focus (Gtk::Widget*);
 
        void split_region ();
 
@@ -1619,6 +1618,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        void initialize_canvas ();
 
+       void manage_action_scripts ();
+       void set_script_action_name (int i, const std::string&);
+
        /* display control */
 
        bool _show_measures;
@@ -2020,7 +2022,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void cms_new (boost::shared_ptr<ARDOUR::Route>);
        void current_mixer_strip_hidden ();
 
-#ifdef GTKOSX
+#ifdef __APPLE__
        void ensure_all_elements_drawn ();
 #endif
        /* nudging tracks */
@@ -2233,6 +2235,14 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        QuantizeDialog* quantize_dialog;
        MainMenuDisabler* _main_menu_disabler;
 
+       /* private helper functions to help with registering axis */
+
+       Glib::RefPtr<Gtk::Action> reg_sens (Glib::RefPtr<Gtk::ActionGroup> group, char const * name, char const * label, sigc::slot<void> slot);
+       void toggle_reg_sens (Glib::RefPtr<Gtk::ActionGroup> group, char const * name, char const * label, sigc::slot<void> slot);
+       void radio_reg_sens (Glib::RefPtr<Gtk::ActionGroup> action_group, Gtk::RadioAction::Group& radio_group, char const * name, char const * label, sigc::slot<void> slot);
+
+       Gtkmm2ext::ActionMap myactions;
+
        friend class Drag;
        friend class RegionDrag;
        friend class RegionMoveDrag;