Add missing snap-to actions to the main menu so that their keyboard accelerators...

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 6903cd20c9236abd6e3273cd26ba6b507d7e7830..2ff5d24999a5c8e8df0a4a58b3caed06c1e3b0f4 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -672,7 +672,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        Gtk::Menu* build_track_selection_context_menu ();
        void add_dstream_context_items (Gtk::Menu_Helpers::MenuList&);
        void add_bus_context_items (Gtk::Menu_Helpers::MenuList&);
-       void add_region_context_items (Gtk::Menu_Helpers::MenuList&, bool);
+       void add_region_context_items (Gtk::Menu_Helpers::MenuList&, boost::shared_ptr<ARDOUR::Track>);
        void add_crossfade_context_items (AudioStreamView*, boost::shared_ptr<ARDOUR::Crossfade>, Gtk::Menu_Helpers::MenuList&, bool many);
        void add_selection_context_items (Gtk::Menu_Helpers::MenuList&);
        Gtk::MenuItem* _popup_region_menu_item;
@@ -941,10 +941,15 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
         void reset_controls_layout_width ();
         void reset_controls_layout_height (int32_t height);
 
-       bool horizontal_scroll_left_press ();
-       void horizontal_scroll_left_release ();
-       bool horizontal_scroll_right_press ();
-       void horizontal_scroll_right_release ();
+       enum Direction {
+               LEFT,
+               RIGHT,
+               UP,
+               DOWN
+       };
+               
+       bool scroll_press (Direction);
+       void scroll_release ();
        sigc::connection _scroll_connection;
        int _scroll_callbacks;
 
@@ -1133,8 +1138,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void snap_regions_to_grid ();
        void close_region_gaps ();
 
-       int  get_prefix (float&, bool&);
-
        void keyboard_paste ();
 
        void region_from_selection ();
@@ -1156,9 +1159,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void temporal_zoom_by_frame (framepos_t start, framepos_t end, const std::string & op);
        void temporal_zoom_to_frame (bool coarser, framepos_t frame);
 
-       void amplitude_zoom (gdouble scale);
-       void amplitude_zoom_step (bool in);
-
        void insert_region_list_drag (boost::shared_ptr<ARDOUR::Region>, int x, int y);
        void insert_region_list_selection (float times);
 
@@ -1220,25 +1220,15 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        void move_to_start ();
        void move_to_end ();
-       void goto_frame ();
        void center_playhead ();
        void center_edit_point ();
-       void edit_cursor_backward ();
-       void edit_cursor_forward ();
        void playhead_forward_to_grid ();
        void playhead_backward_to_grid ();
-       void playhead_backward ();
-       void playhead_forward ();
        void scroll_playhead (bool forward);
        void scroll_backward (float pages=0.8f);
        void scroll_forward (float pages=0.8f);
        void scroll_tracks_down ();
        void scroll_tracks_up ();
-       void delete_sample_forward ();
-       void delete_sample_backward ();
-       void delete_screen ();
-       void search_backwards ();
-       void search_forwards ();
        void set_mark ();
        void clear_markers ();
        void clear_ranges ();