remove all trace of SAE from source code.

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index b9521218afa39fe54861203188e6006f531cc5f0..a2b777e7bedbd44b36c584f05d63fc4fc5cea972 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; }
 
@@ -349,7 +349,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 +549,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;
@@ -808,8 +806,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 +1170,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 */
 
@@ -2233,6 +2228,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;