Make FFT easier to use. right click on a range selection or a region and
[ardour.git] / gtk2_ardour / editor.h
index 43205fb31a1b70c070ad7af2ef7a755a6e391749..e729a27fc110b95d4aa18727de7c33632f7664cf 100644 (file)
 
 #include <cmath>
 
-#include <sndfile.h>
-
 #include <gtkmm/layout.h>
 #include <gtkmm/comboboxtext.h>
 
 #include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/click_box.h>
+#include <gtkmm2ext/dndtreeview.h>
 
 #include <ardour/stateful.h>
 #include <ardour/session.h>
 #include <ardour/tempo.h>
 #include <ardour/location.h>
 #include <ardour/region.h>
+#include <ardour/externalsource.h>
 
-#include "keyboard_target.h"
 #include "audio_clock.h"
 #include "gtk-custom-ruler.h"
 #include "ardour_dialog.h"
@@ -56,6 +55,7 @@
 #include "enums.h"
 #include "region_selection.h"
 #include "canvas.h"
+#include "draginfo.h"
 
 namespace Gtkmm2ext {
        class TearOff;
@@ -102,6 +102,7 @@ class AutomationSelection;
 class MixerStrip;
 class StreamView;
 class ControlPoint;
+class AnalysisWindow;
 
 /* <CMT Additions> */
 class ImageFrameView;
@@ -142,11 +143,11 @@ class Editor : public PublicEditor
        void step_mouse_mode (bool next);
        Editing::MouseMode current_mouse_mode () { return mouse_mode; }
 
-       void add_imageframe_time_axis(std::string track_name, void*) ;
-       void add_imageframe_marker_time_axis(std::string track_name, TimeAxisView* marked_track, void*) ;
+       void add_imageframe_time_axis(const string & track_name, void*) ;
+       void add_imageframe_marker_time_axis(const string & track_name, TimeAxisView* marked_track, void*) ;
        void connect_to_image_compositor() ;
        void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) ;
-       TimeAxisView* get_named_time_axis(std::string name) ;
+       TimeAxisView* get_named_time_axis(const string & name) ;
        /* </CMT Additions> */
 
        void consider_auditioning (ARDOUR::Region&);
@@ -215,8 +216,8 @@ class Editor : public PublicEditor
        Selection& get_cut_buffer() const { return *cut_buffer; }
 
        void play_selection ();
-       void select_all_in_track (bool add);
-       void select_all (bool add);
+       void select_all_in_track (Selection::Operation op);
+       void select_all (Selection::Operation op);
        void invert_selection_in_track ();
        void invert_selection ();
 
@@ -225,6 +226,10 @@ class Editor : public PublicEditor
        void set_show_measures (bool yn);
        bool show_measures () const { return _show_measures; }
 
+       /* analysis window */
+       void analyze_region_selection();
+       void analyze_range_selection();
+
        /* export */
 
        /* these initiate export ... */
@@ -254,13 +259,17 @@ class Editor : public PublicEditor
        jack_nframes_t leftmost_frame;
        void clear_playlist (ARDOUR::Playlist&);
 
+       void new_playlists ();
+       void copy_playlists ();
+       void clear_playlists ();
+
        TrackViewList* get_valid_views (TimeAxisView*, ARDOUR::RouteGroup* grp = 0);
 
        Width editor_mixer_strip_width;
        void show_editor_mixer (bool yn);
        void set_selected_mixer_strip (TimeAxisView&);
-       void unselect_strip_in_display (TimeAxisView& tv);
-       void select_strip_in_display (TimeAxisView* tv);
+       void hide_track_in_display (TimeAxisView& tv);
+       void show_track_in_display (TimeAxisView& tv);
 
        /* nudge is initiated by transport controls owned by ARDOUR_UI */
 
@@ -278,6 +287,13 @@ class Editor : public PublicEditor
        void toggle_follow_playhead ();
        bool follow_playhead() const { return _follow_playhead; }
 
+       void toggle_waveform_visibility ();
+       void toggle_waveforms_while_recording ();
+       void toggle_measure_visibility ();
+
+       void set_meter_falloff (float);
+       void set_meter_hold (int32_t);
+
        /* xfades */
 
        void toggle_xfades_active();
@@ -303,12 +319,14 @@ class Editor : public PublicEditor
 
        void reposition_x_origin (jack_nframes_t sample);
 
+       void maximise_editing_space();
+       void restore_editing_space();
+
   protected:
        void map_transport_state ();
        void map_position_change (jack_nframes_t);
 
        void on_realize();
-       void on_map ();
 
   private:
        
@@ -374,10 +392,11 @@ class Editor : public PublicEditor
        Editing::MouseMode mouse_mode;
        void      mouse_insert (GdkEventButton *);
 
+       int  pre_maximal_pane_position;
        void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*);
 
-       Gtk::HPaned   canvas_region_list_pane;
-       Gtk::HPaned   track_list_canvas_pane;
+       Gtk::Notebook the_notebook;
+       Gtk::HPaned   edit_pane;
 
        Gtk::EventBox meter_base;
        Gtk::HBox     meter_box;
@@ -432,11 +451,22 @@ class Editor : public PublicEditor
        CrossfadeView*     clicked_crossfadeview;
        ControlPoint*      clicked_control_point;
 
+       void mapover_audio_tracks (sigc::slot<void,AudioTimeAxisView&,uint32_t> sl);
+
+       /* functions to be passed to mapover_audio_tracks(), possibly with sigc::bind()-supplied arguments */
+
+       void mapped_set_selected_regionview_from_click (AudioTimeAxisView&, uint32_t, AudioRegionView*, vector<AudioRegionView*>*);
+       void mapped_use_new_playlist (AudioTimeAxisView&, uint32_t);
+       void mapped_use_copy_playlist (AudioTimeAxisView&, uint32_t);
+       void mapped_clear_playlist (AudioTimeAxisView&, uint32_t);
+
+       /* end */
+
        void catch_vanishing_audio_regionview (AudioRegionView *);
-       void set_selected_control_point_from_click (bool add = false, bool with_undo = true, bool no_remove=false);
-       void set_selected_track_from_click (bool add = false, bool with_undo = true, bool no_remove=false);
-       void set_selected_regionview_from_click (bool add = false, bool no_track_remove=false);
-       void set_selected_regionview_from_region_list (ARDOUR::Region& region, bool add = false);
+       void set_selected_control_point_from_click (Selection::Operation op = Selection::Set, bool with_undo = true, bool no_remove=false);
+       void set_selected_track_from_click (Selection::Operation op = Selection::Set, bool with_undo = true, bool no_remove=false);
+       void set_selected_regionview_from_click (Selection::Operation op = Selection::Set, bool no_track_remove=false);
+       void set_selected_regionview_from_region_list (ARDOUR::Region& region, Selection::Operation op = Selection::Set);
        bool set_selected_regionview_from_map_event (GdkEventAny*, StreamView*, ARDOUR::Region*);
        void collect_new_region_view (AudioRegionView *);
 
@@ -487,8 +517,8 @@ class Editor : public PublicEditor
        
        bool track_canvas_motion (GdkEvent*);
 
-       void set_verbose_canvas_cursor (string, double x, double y);
-       void set_verbose_canvas_cursor_text (string);
+       void set_verbose_canvas_cursor (const string &, double x, double y);
+       void set_verbose_canvas_cursor_text (const string &);
        void show_verbose_canvas_cursor();
        void hide_verbose_canvas_cursor();
 
@@ -546,15 +576,15 @@ class Editor : public PublicEditor
        void store_ruler_visibility ();
        void restore_ruler_visibility ();
        
-       static gint _metric_get_smpte (GtkCustomRulerMark **, gulong, gulong, gint);
-       static gint _metric_get_bbt (GtkCustomRulerMark **, gulong, gulong, gint);
-       static gint _metric_get_frames (GtkCustomRulerMark **, gulong, gulong, gint);
-       static gint _metric_get_minsec (GtkCustomRulerMark **, gulong, gulong, gint);
+       static gint _metric_get_smpte (GtkCustomRulerMark **, gdouble, gdouble, gint);
+       static gint _metric_get_bbt (GtkCustomRulerMark **, gdouble, gdouble, gint);
+       static gint _metric_get_frames (GtkCustomRulerMark **, gdouble, gdouble, gint);
+       static gint _metric_get_minsec (GtkCustomRulerMark **, gdouble, gdouble, gint);
        
-       gint metric_get_smpte (GtkCustomRulerMark **, gulong, gulong, gint);
-       gint metric_get_bbt (GtkCustomRulerMark **, gulong, gulong, gint);
-       gint metric_get_frames (GtkCustomRulerMark **, gulong, gulong, gint);
-       gint metric_get_minsec (GtkCustomRulerMark **, gulong, gulong, gint);
+       gint metric_get_smpte (GtkCustomRulerMark **, gdouble, gdouble, gint);
+       gint metric_get_bbt (GtkCustomRulerMark **, gdouble, gdouble, gint);
+       gint metric_get_frames (GtkCustomRulerMark **, gdouble, gdouble, gint);
+       gint metric_get_minsec (GtkCustomRulerMark **, gdouble, gdouble, gint);
 
        GtkWidget          *_smpte_ruler;
        GtkWidget          *_bbt_ruler;
@@ -577,17 +607,11 @@ class Editor : public PublicEditor
        ArdourCanvas::SimpleRect* transport_marker_bar;
 
        
-       ArdourCanvas::Line* tempo_line;
-       ArdourCanvas::Line* meter_line;
-       ArdourCanvas::Line* marker_line;
-       ArdourCanvas::Line* range_marker_line;
-       ArdourCanvas::Line* transport_marker_line;
-
-       ArdourCanvas::Points tempo_line_points;
-       ArdourCanvas::Points meter_line_points;
-       ArdourCanvas::Points marker_line_points;
-       ArdourCanvas::Points range_marker_line_points;
-       ArdourCanvas::Points transport_marker_line_points;
+       ArdourCanvas::SimpleLine* tempo_line;
+       ArdourCanvas::SimpleLine* meter_line;
+       ArdourCanvas::SimpleLine* marker_line;
+       ArdourCanvas::SimpleLine* range_marker_line;
+       ArdourCanvas::SimpleLine* transport_marker_line;
 
        Gtk::Label  minsec_label;
        Gtk::Label  bbt_label;
@@ -605,12 +629,12 @@ class Editor : public PublicEditor
 
        struct Cursor {
            Editor&               editor;
-           ArdourCanvas::Points* points;
-           ArdourCanvas::Item*  canvas_item;
+           ArdourCanvas::Points  points;
+           ArdourCanvas::Line    canvas_item;
            jack_nframes_t        current_frame;
            double                length;
 
-           Cursor (Editor&, const string& color, bool (Editor::*)(GdkEvent*));
+           Cursor (Editor&, const string& color, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*));
            ~Cursor ();
 
            void set_position (jack_nframes_t);
@@ -631,6 +655,7 @@ class Editor : public PublicEditor
        void    cursor_to_region_point (Cursor*, ARDOUR::RegionPoint, int32_t dir);
        void    cursor_to_selection_start (Cursor *);
        void    cursor_to_selection_end   (Cursor *);
+       void    select_all_selectables_using_cursor (Cursor *, bool);
 
        ARDOUR::Region* find_next_region (jack_nframes_t, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView ** = 0);
 
@@ -646,48 +671,25 @@ class Editor : public PublicEditor
        Gtk::Frame          edit_frame;
        Gtk::VScrollbar     edit_vscrollbar;
 
-       /* the horizontal scroller works in a rather different way
-          than a regular scrollbar, since its used for
-          zoom control/indication as well. But more importantly,
-          its different components (slider, left arrow, right arrow) 
-          have to be packed separately into the edit_packer.
-       */
+       Gtk::Adjustment     vertical_adjustment;
+       Gtk::Adjustment     horizontal_adjustment;
+
+       Gtk::Layout         controls_layout;
+       bool control_layout_scroll (GdkEventScroll* ev);
+       void controls_layout_size_request (Gtk::Requisition*);
 
        Gtk::HScrollbar     edit_hscrollbar;
-       Gtk::DrawingArea    edit_hscroll_slider;
-       Gtk::Arrow          edit_hscroll_left_arrow;
-       Gtk::Arrow          edit_hscroll_right_arrow;
-       Gtk::EventBox       edit_hscroll_left_arrow_event;
-       Gtk::EventBox       edit_hscroll_right_arrow_event;
-       gint                edit_hscroll_slider_width;
-       gint                edit_hscroll_slider_height;
-       static const gint   edit_hscroll_edge_width = 3;
        bool                edit_hscroll_dragging;
-       double              edit_hscroll_drag_last;
-       
-       void hscroll_slider_allocate (Gtk::Allocation &);
-       gint hscroll_slider_expose (GdkEventExpose*);
-       gint hscroll_slider_button_press (GdkEventButton*);
-       gint hscroll_slider_button_release (GdkEventButton*);
-       gint hscroll_slider_motion (GdkEventMotion*);
-
-       gint hscroll_trough_expose (GdkEventExpose*);
-       gint hscroll_trough_button_press (GdkEventButton*);
-       gint hscroll_trough_button_release (GdkEventButton*);
-
-       void update_hscroller ();
-
-       gint hscroll_left_arrow_button_press (GdkEventButton *);
-       gint hscroll_left_arrow_button_release (GdkEventButton *);
-       gint hscroll_right_arrow_button_press (GdkEventButton *);
-       gint hscroll_right_arrow_button_release (GdkEventButton *);
        
-       guint32             canvas_width;
-       guint32             canvas_height;
+       bool hscrollbar_button_press (GdkEventButton*);
+       bool hscrollbar_button_release (GdkEventButton*);
+       void hscrollbar_allocate (Gtk::Allocation &alloc);
 
-       Gtk::ScrolledWindow  track_canvas_scroller;
-       Gtk::ScrolledWindow  time_canvas_scroller;
-       Gtk::ScrolledWindow  edit_controls_scroller;
+       double canvas_width;
+       double canvas_height;
+
+       bool track_canvas_map_handler (GdkEventAny*);
+       bool time_canvas_map_handler (GdkEventAny*);
 
        gint edit_controls_button_release (GdkEventButton*);
        Gtk::Menu *edit_controls_left_menu;
@@ -714,18 +716,21 @@ class Editor : public PublicEditor
            RegionListDisplayModelColumns() {
                    add (name);
                    add (region);
+                   add (color_);
            }
            Gtk::TreeModelColumn<Glib::ustring> name;
            Gtk::TreeModelColumn<ARDOUR::Region*> region;
+               Gtk::TreeModelColumn<Gdk::Color> color_;
        };
            
        RegionListDisplayModelColumns    region_list_columns;
-       Gtk::TreeView                    region_list_display;
+       Gtkmm2ext::DnDTreeView           region_list_display;
        Glib::RefPtr<Gtk::TreeStore>     region_list_model;
-       Glib::RefPtr<Gtk::TreeModelSort> region_list_sort_model;
-       Glib::RefPtr<Gtk::Action>        toggle_full_region_list_action;
+       Glib::RefPtr<Gtk::ToggleAction>  toggle_full_region_list_action;
+       Glib::RefPtr<Gtk::ToggleAction>  toggle_show_auto_regions_action;
 
        void region_list_selection_changed ();
+       bool region_list_selection_filter (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::Path& path, bool yn);
 
        Gtk::Menu          *region_list_menu;
        Gtk::ScrolledWindow region_list_scroller;
@@ -735,17 +740,10 @@ class Editor : public PublicEditor
        bool region_list_display_key_release (GdkEventKey *);
        bool region_list_display_button_press (GdkEventButton *);
        bool region_list_display_button_release (GdkEventButton *);
-       bool region_list_display_enter_notify (GdkEventCrossing *);
-       bool region_list_display_leave_notify (GdkEventCrossing *);
        void region_list_clear ();
        void region_list_selection_mapover (sigc::slot<void,ARDOUR::Region&>);
        void build_region_list_menu ();
-
-       Gtk::CheckMenuItem* toggle_auto_regions_item;
-       Gtk::CheckMenuItem* toggle_full_region_list_item;
-
-       Gtk::MenuItem* import_audio_item;
-       Gtk::MenuItem* embed_audio_item;
+       void show_region_list_display_context_menu (int button, int time);
 
        bool show_automatic_regions_in_region_list;
        Editing::RegionListSortType region_list_sort_type;
@@ -758,6 +756,26 @@ class Editor : public PublicEditor
 
        int region_list_sorter (Gtk::TreeModel::iterator, Gtk::TreeModel::iterator);
 
+       /* snapshots */
+
+       Gtk::ScrolledWindow      snapshot_display_scroller;
+       struct SnapshotDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
+           SnapshotDisplayModelColumns() { 
+                   add (visible_name);
+                   add (real_name);
+           }
+           Gtk::TreeModelColumn<Glib::ustring> visible_name;
+           Gtk::TreeModelColumn<Glib::ustring> real_name;
+       };
+
+       SnapshotDisplayModelColumns snapshot_display_columns;
+       Glib::RefPtr<Gtk::ListStore> snapshot_display_model;
+       Gtk::TreeView snapshot_display;
+
+       bool snapshot_display_button_press (GdkEventButton*);
+       void snapshot_display_selection_changed ();
+       void redisplay_snapshots();
+
        /* named selections */
 
        struct NamedSelectionDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
@@ -772,13 +790,12 @@ class Editor : public PublicEditor
        NamedSelectionDisplayModelColumns named_selection_columns;
        Glib::RefPtr<Gtk::TreeStore>     named_selection_model;
 
-       Gtk::VPaned         region_selection_vpane;
-       Gtk::TreeView          named_selection_display;
-       Gtk::ScrolledWindow named_selection_scroller;
+       Gtkmm2ext::DnDTreeView named_selection_display;
+       Gtk::ScrolledWindow    named_selection_scroller;
 
        void name_selection();
        void named_selection_name_chosen ();
-       void create_named_selection (string);
+       void create_named_selection (const string &);
        void paste_named_selection (float times);
 
        void handle_new_named_selection ();
@@ -801,7 +818,6 @@ class Editor : public PublicEditor
        static Gdk::Cursor* time_fx_cursor;
        static Gdk::Cursor* fader_cursor;
        static Gdk::Cursor* speaker_cursor;
-       static Gdk::Cursor* null_cursor;
        static Gdk::Cursor* wait_cursor;
        static Gdk::Cursor* timebar_cursor;
 
@@ -834,7 +850,6 @@ class Editor : public PublicEditor
        /* KEYMAP HANDLING */
 
        void register_actions ();
-       void install_keybindings ();
 
        int ensure_cursor (jack_nframes_t* pos);
 
@@ -869,6 +884,7 @@ class Editor : public PublicEditor
        void split_region_at (jack_nframes_t);
        void split_regions_at (jack_nframes_t, AudioRegionSelection&);
        void crop_region_to_selection ();
+       void set_a_regions_sync_position (ARDOUR::Region&, jack_nframes_t);
        void set_region_sync_from_edit_cursor ();
        void remove_region_sync();
        void align_selection (ARDOUR::RegionPoint, jack_nframes_t position);
@@ -932,25 +948,25 @@ class Editor : public PublicEditor
        void temporal_zoom_selection ();
        void temporal_zoom_session ();
        void temporal_zoom (gdouble scale);
-       void temporal_zoom_by_frame (jack_nframes_t start, jack_nframes_t end, string op);
+       void temporal_zoom_by_frame (jack_nframes_t start, jack_nframes_t end, const string & op);
        void temporal_zoom_to_frame (bool coarser, jack_nframes_t frame);
 
        void amplitude_zoom (gdouble scale);
        void amplitude_zoom_step (bool in);
 
-       void insert_region_list_drag (ARDOUR::AudioRegion&);
+       void insert_region_list_drag (ARDOUR::AudioRegion&, int x, int y);
        void insert_region_list_selection (float times);
 
        void insert_sndfile (bool as_tracks);
        void embed_audio ();    // inserts into region list
-       int  reject_because_rate_differs (string path, SF_INFO& finfo, string action, bool multiple_pending);
+       int  reject_because_rate_differs (const string & path, ARDOUR::SoundFileInfo& finfo, const string & action, bool multiple_pending);
 
        void do_embed_sndfiles (vector<string> paths, bool split);
        void embed_sndfile (string path, bool split, bool multiple_files, bool& check_sr);
 
        void do_insert_sndfile (vector<string> path, bool multi, jack_nframes_t frame);
        void insert_paths_as_new_tracks (std::vector<std::string> paths, bool multi); // inserts files as new tracks
-       void insert_sndfile_into (string path, bool multi, AudioTimeAxisView* tv, jack_nframes_t& frame, bool prompt=true);
+       void insert_sndfile_into (const string & path, bool multi, AudioTimeAxisView* tv, jack_nframes_t& frame, bool prompt=true);
        static void* _insert_sndfile_thread (void*);
        void*  insert_sndfile_thread (void*);
 
@@ -966,6 +982,7 @@ class Editor : public PublicEditor
        void interthread_cancel_clicked ();
        void build_interthread_progress_window ();
        ARDOUR::InterThreadInfo* current_interthread_info;
+       AnalysisWindow* analysis_window;
 
        /* import specific info */
 
@@ -1008,7 +1025,9 @@ class Editor : public PublicEditor
        void cursor_align (bool playhead_to_edit);
 
        void remove_last_capture ();
-
+       void select_all_selectables_using_time_selection ();
+       void select_all_selectables_using_loop();
+       void select_all_selectables_using_punch();
        void set_selection_from_range (ARDOUR::Location&);
        void set_selection_from_punch ();
        void set_selection_from_loop ();
@@ -1037,51 +1056,15 @@ class Editor : public PublicEditor
        Editing::SnapMode snap_mode;
        double snap_threshold;
 
-       void soundfile_chosen_for_insert (string selection, bool split_channels);
-       void soundfile_chosen_for_embed (string selection, bool split_channels);
-       void soundfile_chosen_for_import (string selection, bool split_channels);
+       void soundfile_chosen_for_insert (const string & selection, bool split_channels);
+       void soundfile_chosen_for_embed (const string & selection, bool split_channels);
+       void soundfile_chosen_for_import (const string & selection, bool split_channels);
 
-       void handle_gui_changes (string, void *);
+       void handle_gui_changes (const string &, void *);
 
        void    hide_all_tracks (bool with_select);
 
-       void route_display_selection_changed ();
-       void redisplay_route_list();
-       gint route_list_reordered ();
-       bool ignore_route_list_reorder;
-       void queue_route_list_reordered ();
-
-       struct DragInfo {
-         ArdourCanvas::Item* item;
-           void* data;
-           jack_nframes_t last_frame_position;
-           int32_t pointer_frame_offset;
-           jack_nframes_t grab_frame;
-           jack_nframes_t last_pointer_frame;
-           jack_nframes_t current_pointer_frame;
-           double grab_x, grab_y;
-           double cumulative_x_drag;
-           double cumulative_y_drag;
-           double current_pointer_x;
-           double current_pointer_y;
-         void (Editor::*motion_callback)(ArdourCanvas::Item*, GdkEvent*);
-         void (Editor::*finished_callback)(ArdourCanvas::Item*, GdkEvent*);
-           TimeAxisView* last_trackview;
-           bool x_constrained;
-           bool copy;
-           bool was_rolling;
-           bool first_move;
-           bool move_threshold_passsed;
-           bool want_move_threshold;
-           bool brushing;
-           ARDOUR::Location* copied_location;
-       } drag_info;
-
-       struct LineDragInfo {
-           uint32_t before;
-           uint32_t after;
-       };
-
+       DragInfo drag_info;
        LineDragInfo current_line_drag_info;
 
        void start_grab (GdkEvent*, Gdk::Cursor* cursor = 0);
@@ -1129,7 +1112,9 @@ class Editor : public PublicEditor
        void start_line_grab_from_line (ArdourCanvas::Item*, GdkEvent*);
        void start_line_grab (AutomationLine *, GdkEvent*);
        void start_tempo_marker_grab (ArdourCanvas::Item*, GdkEvent*);
+       void start_tempo_marker_copy_grab (ArdourCanvas::Item*, GdkEvent*);
        void start_meter_marker_grab (ArdourCanvas::Item*, GdkEvent*);
+       void start_meter_marker_copy_grab (ArdourCanvas::Item*, GdkEvent*);
 
        void region_view_item_click (AudioRegionView&, GdkEventButton*);
 
@@ -1144,9 +1129,6 @@ class Editor : public PublicEditor
 
        /* Canvas event handlers */
 
-       // FIXED FOR GTK2
-
-
        bool canvas_control_point_event (GdkEvent* event,ArdourCanvas::Item*, ControlPoint*);
        bool canvas_line_event (GdkEvent* event,ArdourCanvas::Item*, AutomationLine*);
        bool canvas_selection_rect_event (GdkEvent* event,ArdourCanvas::Item*, SelectionRect*);
@@ -1173,20 +1155,21 @@ class Editor : public PublicEditor
        bool canvas_range_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
        bool canvas_transport_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
 
-       bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*);
-       bool canvas_imageframe_view_event(GdkEvent* event, ArdourCanvas::Item*);
-       bool canvas_imageframe_start_handle_event(GdkEvent* event, ArdourCanvas::Item*);
-       bool canvas_imageframe_end_handle_event(GdkEvent* event, ArdourCanvas::Item*);
-       bool canvas_marker_time_axis_view_event(GdkEvent* event, ArdourCanvas::Item*);
-       bool canvas_markerview_item_view_event(GdkEvent* event, ArdourCanvas::Item*);
-       bool canvas_markerview_start_handle_event(GdkEvent* event, ArdourCanvas::Item*);
-       bool canvas_markerview_end_handle_event(GdkEvent* event, ArdourCanvas::Item*);
+       bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*);
+       bool canvas_imageframe_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameTimeAxis*);
+       bool canvas_imageframe_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*);
+       bool canvas_imageframe_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*);
+       bool canvas_marker_time_axis_view_event(GdkEvent* event, ArdourCanvas::Item*,MarkerTimeAxis*);
+       bool canvas_markerview_item_view_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*);
+       bool canvas_markerview_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*);
+       bool canvas_markerview_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*);
 
        /* non-public event handlers */
 
-       bool canvas_playhead_cursor_event (GdkEvent* event);
-       bool canvas_edit_cursor_event (GdkEvent* event);
+       bool canvas_playhead_cursor_event (GdkEvent* event, ArdourCanvas::Item*);
+       bool canvas_edit_cursor_event (GdkEvent* event, ArdourCanvas::Item*);
        bool track_canvas_event (GdkEvent* event, ArdourCanvas::Item*);
+       bool track_canvas_scroll (GdkEventScroll* event);
 
        bool track_canvas_button_press_event (GdkEventButton *);
        bool track_canvas_button_release_event (GdkEventButton *);
@@ -1200,13 +1183,16 @@ class Editor : public PublicEditor
        void kbd_driver (sigc::slot<void,GdkEvent*>, bool use_track_canvas = true, bool use_time_canvas = true, bool can_select = true);
        void kbd_set_playhead_cursor ();
        void kbd_set_edit_cursor ();
+       void kbd_mute_unmute_region ();
        void kbd_split ();
+       void kbd_set_sync_position ();
        void kbd_align (ARDOUR::RegionPoint);
        void kbd_align_relative (ARDOUR::RegionPoint);
        void kbd_brush ();
        void kbd_audition ();
 
        void kbd_do_split (GdkEvent*);
+       void kbd_do_set_sync_position (GdkEvent* ev);
        void kbd_do_align (GdkEvent*, ARDOUR::RegionPoint);
        void kbd_do_align_relative (GdkEvent*, ARDOUR::RegionPoint);
        void kbd_do_brush (GdkEvent*);
@@ -1218,13 +1204,6 @@ class Editor : public PublicEditor
        void reset_scrolling_region (Gtk::Allocation* alloc = 0);
        void scroll_canvas ();
 
-        /* sub-event loop handling */
-
-        int32_t sub_event_loop_status;
-        void run_sub_event_loop ();
-        void finish_sub_event_loop (int status);
-        gint finish_sub_event_loop_on_delete (GdkEventAny*, int32_t status);
-       
        /* display control */
        
        bool _show_measures;
@@ -1236,12 +1215,12 @@ class Editor : public PublicEditor
 
        ARDOUR::TempoMap::BBTPointList *current_bbt_points;
        
-       typedef vector<ArdourCanvas::Line*> TimeLineList;
+       typedef vector<ArdourCanvas::SimpleLine*> TimeLineList;
        TimeLineList free_measure_lines;
        TimeLineList used_measure_lines;
 
        ArdourCanvas::Group* time_line_group;
-       ArdourCanvas::Line* get_time_line ();
+       ArdourCanvas::SimpleLine* get_time_line ();
        void hide_measures ();
        void draw_measures ();
        void draw_time_bars ();
@@ -1266,6 +1245,7 @@ class Editor : public PublicEditor
        void marker_menu_rename ();
        void marker_menu_hide ();
        void marker_menu_loop_range ();
+       void marker_menu_select_all_selectables_using_range ();
        void marker_menu_play_from ();
        void marker_menu_set_playhead ();
        void marker_menu_set_from_playhead ();
@@ -1279,6 +1259,7 @@ class Editor : public PublicEditor
        void tm_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
        void transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
        void new_transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
+       void build_range_marker_menu ();
        void build_marker_menu ();
        void build_tm_marker_menu ();
        void build_transport_marker_menu ();
@@ -1413,10 +1394,6 @@ class Editor : public PublicEditor
 
        bool audio_region_selection_covers (jack_nframes_t where);
 
-       Gtk::VPaned  route_group_vpane;
-       Gtk::Frame   route_list_frame;
-       Gtk::Frame   edit_group_list_frame;
-
        /* transport range select process */
        enum RangeMarkerOp {
                CreateRangeMarker,
@@ -1427,21 +1404,21 @@ class Editor : public PublicEditor
        void drag_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event);
        void end_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event);
 
-       ArdourCanvas::SimpleRect*    range_bar_drag_rect;
-       ArdourCanvas::SimpleRect*      transport_bar_drag_rect;
-       ArdourCanvas::Line*      marker_drag_line;
-       ArdourCanvas::Points*    marker_drag_line_points;
-       ArdourCanvas::SimpleRect*      range_marker_drag_rect;
+       ArdourCanvas::SimpleRect*  range_bar_drag_rect;
+       ArdourCanvas::SimpleRect*  transport_bar_drag_rect;
+       ArdourCanvas::Line*        marker_drag_line;
+       ArdourCanvas::Points       marker_drag_line_points;
+       ArdourCanvas::SimpleRect*  range_marker_drag_rect;
 
        void update_marker_drag_item (ARDOUR::Location *);
        
-       ArdourCanvas::SimpleRect      *transport_bar_range_rect;
+       ArdourCanvas::SimpleRect     *transport_bar_range_rect;
        ArdourCanvas::SimpleRect     *transport_bar_preroll_rect;
-       ArdourCanvas::SimpleRect      *transport_bar_postroll_rect;
+       ArdourCanvas::SimpleRect     *transport_bar_postroll_rect;
        ArdourCanvas::SimpleRect     *transport_loop_range_rect;
-       ArdourCanvas::SimpleRect      *transport_punch_range_rect;
-       ArdourCanvas::Line           *transport_punchin_line;
-       ArdourCanvas::Line           *transport_punchout_line;
+       ArdourCanvas::SimpleRect     *transport_punch_range_rect;
+       ArdourCanvas::SimpleLine     *transport_punchin_line;
+       ArdourCanvas::SimpleLine     *transport_punchout_line;
        ArdourCanvas::SimpleRect     *transport_preroll_rect;
        ArdourCanvas::SimpleRect     *transport_postroll_rect;
 
@@ -1456,9 +1433,9 @@ class Editor : public PublicEditor
        void drag_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event);
        void end_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event);
 
-       bool select_all_within (jack_nframes_t start, jack_nframes_t end, gdouble topy, gdouble boty, bool add);
+       bool select_all_within (jack_nframes_t start, jack_nframes_t end, gdouble topy, gdouble boty, Selection::Operation op);
        
-       ArdourCanvas::Item   *rubberband_rect;
+       ArdourCanvas::SimpleRect   *rubberband_rect;
        
        /* mouse zoom process */
 
@@ -1466,7 +1443,7 @@ class Editor : public PublicEditor
        void drag_mouse_zoom (ArdourCanvas::Item* item, GdkEvent* event);
        void end_mouse_zoom (ArdourCanvas::Item* item, GdkEvent* event);
 
-       ArdourCanvas::Item   *zoom_rect;
+       ArdourCanvas::SimpleRect   *zoom_rect;
        void reposition_zoom_rect (jack_nframes_t start, jack_nframes_t end);
        
        /* diskstream/route display management */
@@ -1474,39 +1451,59 @@ class Editor : public PublicEditor
        struct RouteDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
            RouteDisplayModelColumns() { 
                    add (text);
+                   add (visible);
                    add (tv);
            }
            Gtk::TreeModelColumn<Glib::ustring>  text;
-           Gtk::TreeModelColumn<TimeAxisView*>    tv;
+           Gtk::TreeModelColumn<bool>           visible;
+           Gtk::TreeModelColumn<TimeAxisView*>  tv;
        };
 
-       RouteDisplayModelColumns    route_display_columns;
-       Glib::RefPtr<Gtk::ListStore> route_display_model;
+       RouteDisplayModelColumns         route_display_columns;
+       Glib::RefPtr<Gtk::ListStore>     route_display_model;
        Glib::RefPtr<Gtk::TreeSelection> route_display_selection;
 
        gint route_list_compare_func (Gtk::TreeModel::iterator, Gtk::TreeModel::iterator);
-       Gtk::TreeView          route_list; //GTK2FIX rename to route_display
-       Gtk::ScrolledWindow route_list_scroller;
-       Gtk::Menu          *route_list_menu;
+       Gtkmm2ext::DnDTreeView   route_list_display; 
+       Gtk::ScrolledWindow      route_list_scroller;
+       Gtk::Menu*               route_list_menu;
+
+       bool route_list_display_button_press (GdkEventButton*);
+       bool route_list_selection_filter (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::Path& path, bool yn);
+
+       void route_list_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&);
+       void route_list_delete (const Gtk::TreeModel::Path&);
+       void initial_route_list_display ();
+       void redisplay_route_list();
+       void route_list_reordered (const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter, int* what);
+       bool ignore_route_list_reorder;
+       bool no_route_list_redisplay;
+       void queue_route_list_reordered ();
 
-       void route_list_column_click ();
        void build_route_list_menu ();
-       void select_all_routes ();
-       void unselect_all_routes ();
-       void select_all_audiotracks ();
-       void unselect_all_audiotracks ();
-       void select_all_audiobus ();
-       void unselect_all_audiobus ();
+       void show_route_list_menu ();
+
+       void show_all_routes ();
+       void hide_all_routes ();
+       void show_all_audiotracks ();
+       void hide_all_audiotracks ();
+       void show_all_audiobus ();
+       void hide_all_audiobus ();
+
+       void set_all_tracks_visibility (bool yn);
+       void set_all_audio_visibility (int type, bool yn);
 
        /* edit group management */
 
         struct GroupListModelColumns : public Gtk::TreeModel::ColumnRecord {
                 GroupListModelColumns () {
                       add (is_active);
+                      add (is_visible);
                        add (text);
                       add (routegroup);
                 }
                Gtk::TreeModelColumn<bool> is_active;
+               Gtk::TreeModelColumn<bool> is_visible;
                Gtk::TreeModelColumn<std::string> text;
                Gtk::TreeModelColumn<ARDOUR::RouteGroup*>   routegroup;
        };
@@ -1515,32 +1512,30 @@ class Editor : public PublicEditor
        Glib::RefPtr<Gtk::ListStore> group_model;
        Glib::RefPtr<Gtk::TreeSelection> group_selection;
 
-       Gtk::Button         edit_group_list_button;
-       Gtk::Label          edit_group_list_button_label;
-       Gtk::TreeView       edit_group_list;
-       Gtk::ScrolledWindow edit_group_list_scroller;
-       Gtk::Menu          *edit_group_list_menu;
-       Gtk::VBox           edit_group_vbox;
+       Gtk::TreeView          edit_group_display;
+       Gtk::ScrolledWindow    edit_group_display_scroller;
+       Gtk::Menu*             edit_group_list_menu;
 
-       void edit_group_list_column_click (gint);
        void build_edit_group_list_menu ();
-       void select_all_edit_groups ();
-       void unselect_all_edit_groups ();
+       void activate_all_edit_groups ();
+       void disable_all_edit_groups ();
+
+       bool in_edit_group_row_change;
+       void edit_group_row_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&);
+       void edit_group_name_edit (const Glib::ustring&, const Glib::ustring&);
        void new_edit_group ();
        void edit_group_list_button_clicked ();
        gint edit_group_list_button_press_event (GdkEventButton* ev);
        void edit_group_selection_changed ();
        void fake_add_edit_group (ARDOUR::RouteGroup* group);
+       void fake_remove_edit_group (ARDOUR::RouteGroup* group);
        void add_edit_group (ARDOUR::RouteGroup* group);
+       void remove_selected_edit_group ();
+       void edit_groups_changed ();
        void group_flags_changed (void*, ARDOUR::RouteGroup*);
 
        Gtk::VBox           list_vpacker;
 
-       static GdkPixmap* check_pixmap;
-       static GdkBitmap* check_mask;
-       static GdkPixmap* empty_pixmap;
-       static GdkBitmap* empty_mask;
-
        /* autoscrolling */
 
        int autoscroll_timeout_tag;
@@ -1579,36 +1574,53 @@ class Editor : public PublicEditor
        /* Drag-n-Drop */
 
        int convert_drop_to_paths (std::vector<std::string>& paths,
-                                  GdkDragContext     *context,
+                                  const Glib::RefPtr<Gdk::DragContext>& context,
                                   gint                x,
                                   gint                y,
-                                  GtkSelectionData   *data,
+                                  const Gtk::SelectionData& data,
                                   guint               info,
                                   guint               time);
 
-       void  track_canvas_drag_data_received  (GdkDragContext     *context,
+       void  track_canvas_drag_data_received  (const Glib::RefPtr<Gdk::DragContext>& context,
                                                gint                x,
                                                gint                y,
-                                               GtkSelectionData   *data,
+                                               const Gtk::SelectionData& data,
                                                guint               info,
                                                guint               time);
-
-       void  region_list_display_drag_data_received  (GdkDragContext     *context,
+       
+       void  region_list_display_drag_data_received  (const Glib::RefPtr<Gdk::DragContext>& context,
                                                       gint                x,
                                                       gint                y,
-                                                      GtkSelectionData   *data,
+                                                      const Gtk::SelectionData& data,
                                                       guint               info,
                                                       guint               time);
-       
+
+
+       void  drop_paths  (const Glib::RefPtr<Gdk::DragContext>& context,
+                          gint                x,
+                          gint                y,
+                          const Gtk::SelectionData& data,
+                          guint               info,
+                          guint               time);
+
+       void  drop_regions  (const Glib::RefPtr<Gdk::DragContext>& context,
+                            gint                x,
+                            gint                y,
+                            const Gtk::SelectionData& data,
+                            guint               info,
+                            guint               time);
+
        /* audio export */
 
        ExportDialog *export_dialog;
+       ExportDialog *export_range_markers_dialog;
+       
        void export_range (jack_nframes_t start, jack_nframes_t end);
+       void export_range_markers ();
 
-       int write_region_selection(AudioRegionSelection&);
+       int  write_region_selection(AudioRegionSelection&);
        bool write_region (string path, ARDOUR::AudioRegion&);
        void export_region ();
-       void write_a_region ();
        void bounce_region_selection ();
        void bounce_range_selection ();
        void external_edit_region ();
@@ -1630,11 +1642,11 @@ class Editor : public PublicEditor
        UndoHistory visual_history;
        UndoCommand current_visual_command;
 
-       void begin_reversible_visual_command (string cmd_name);
+       void begin_reversible_visual_command (const string & cmd_name);
        void commit_reversible_visual_command ();
 
        void update_title ();   
-       void update_title_s (string snapshot_name);
+       void update_title_s (const string & snapshot_name);
 
        struct State {
            Selection* selection;
@@ -1734,8 +1746,8 @@ class Editor : public PublicEditor
        bool _xfade_visibility;
        
        /* <CMT Additions> */
-       void handle_new_imageframe_time_axis_view(std::string track_name, void* src) ;
-       void handle_new_imageframe_marker_time_axis_view(std::string track_name, TimeAxisView* marked_track) ;
+       void handle_new_imageframe_time_axis_view(const string & track_name, void* src) ;
+       void handle_new_imageframe_marker_time_axis_view(const string & track_name, TimeAxisView* marked_track) ;
 
        void start_imageframe_grab(ArdourCanvas::Item*, GdkEvent*) ;
        void start_markerview_grab(ArdourCanvas::Item*, GdkEvent*) ;
@@ -1825,12 +1837,9 @@ class Editor : public PublicEditor
        void toggle_gain_envelope_visibility ();
        void toggle_gain_envelope_active ();
        
-       typedef std::map<Editing::ColorID,std::string> ColorStyleMap;
-       void init_colormap ();
-
-       /* GTK2 stuff */
+       bool on_key_press_event (GdkEventKey*);
 
-       Glib::RefPtr<Gtk::UIManager> ui_manager;
+       void session_state_saved (string);
 };
 
 #endif /* __ardour_editor_h__ */