Fix vst typo

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 578fb80abae46b824f6b73345919e178c58ec188..3e080415c06ed82987fef850fb5e59ed8b2cb799 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -150,7 +150,6 @@ class Editor : public PublicEditor
        void connect_to_image_compositor() ;
        void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) ;
        TimeAxisView* get_named_time_axis(const string & name) ;
-       /* </CMT Additions> */
 
        void consider_auditioning (ARDOUR::Region&);
        void hide_a_region (ARDOUR::Region&);
@@ -168,6 +167,7 @@ class Editor : public PublicEditor
 
        void new_region_from_selection ();
        void separate_region_from_selection ();
+       void separate_regions_using_location (ARDOUR::Location&);
        void toggle_playback (bool with_abort);
 
        /* undo related */
@@ -321,7 +321,7 @@ class Editor : public PublicEditor
        void ensure_float (Gtk::Window&);
 
        void show_window ();
-       
+
        void scroll_tracks_down_line ();
        void scroll_tracks_up_line ();
 
@@ -667,6 +667,7 @@ class Editor : public PublicEditor
        void    cursor_to_selection_start (Cursor *);
        void    cursor_to_selection_end   (Cursor *);
        void    select_all_selectables_using_cursor (Cursor *, bool);
+       void    select_all_selectables_between_cursors (Cursor *, Cursor *);
 
        ARDOUR::Region* find_next_region (jack_nframes_t, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView ** = 0);
 
@@ -690,6 +691,8 @@ class Editor : public PublicEditor
 
        Gtk::HScrollbar     edit_hscrollbar;
        bool                edit_hscroll_dragging;
+
+       void reset_hscrollbar_stepping ();
        
        bool hscrollbar_button_press (GdkEventButton*);
        bool hscrollbar_button_release (GdkEventButton*);
@@ -713,6 +716,10 @@ class Editor : public PublicEditor
        Gtk::VBox           edit_controls_vbox;
        Gtk::HBox           edit_controls_hbox;
 
+       void control_scroll (float);
+       bool deferred_control_scroll (jack_nframes_t);
+       sigc::connection control_scroll_connection;
+
        void tie_vertical_scrolling ();
        void canvas_horizontally_scrolled ();
        void reposition_and_zoom (jack_nframes_t sample, double fpu);
@@ -1256,6 +1263,7 @@ class Editor : public PublicEditor
        void marker_menu_hide ();
        void marker_menu_loop_range ();
        void marker_menu_select_all_selectables_using_range ();
+       void marker_menu_separate_regions_using_location ();
        void marker_menu_play_from ();
        void marker_menu_set_playhead ();
        void marker_menu_set_from_playhead ();
@@ -1277,6 +1285,7 @@ class Editor : public PublicEditor
 
        Gtk::Menu* tm_marker_menu;
        Gtk::Menu* marker_menu;
+       Gtk::Menu* range_marker_menu;
        Gtk::Menu* transport_marker_menu;
        Gtk::Menu* new_transport_marker_menu;
        ArdourCanvas::Item* marker_menu_item;