rationalize destruction pathway (some more); tidy-ify some ImageFrame code
[ardour.git] / gtk2_ardour / editor.h
index 420dc3c45775b4b26d3bf2076ba6d2b249997325..ca1082af787791e2ed601ff051c2c58500cb59fd 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2003 Paul Davis 
+    Copyright (C) 2000-2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
 #include <cmath>
 
-#include <gtkmm/layout.h>
 #include <gtkmm/comboboxtext.h>
+#include <gtkmm/layout.h>
 
 #include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/dndtreeview.h>
 
-#include <pbd/stateful.h>
-#include <ardour/session.h>
-#include <ardour/tempo.h>
-#include <ardour/stretch.h>
-#include <ardour/location.h>
-#include <ardour/audioregion.h>
-#include <ardour/track.h>
-#include <ardour/types.h>
+#include "pbd/stateful.h"
+#include "pbd/signals.h"
+
+#include "ardour/import_status.h"
+#include "ardour/tempo.h"
+#include "ardour/location.h"
+#include "ardour/audioregion.h"
+#include "ardour/track.h"
+#include "ardour/types.h"
+#include "ardour/route_group.h"
 
 #include "audio_clock.h"
 #include "gtk-custom-ruler.h"
 #include "editor_items.h"
 #include "region_selection.h"
 #include "canvas.h"
-#include "draginfo.h"
+#include "editor_summary.h"
+
+namespace Gnome { namespace Canvas {
+       class NoEventText;
+} }
 
 namespace Gtkmm2ext {
        class TearOff;
@@ -82,36 +88,47 @@ namespace ARDOUR {
        class Filter;
        class Crossfade;
        class ChanCount;
+       class MidiOperator;
+       class MidiTrack;
+       class AudioTrack;
 }
 
 namespace LADSPA {
        class Plugin;
 }
 
-class TimeAxisView;
+class AnalysisWindow;
+class AudioRegionView;
+class AudioStreamView;
 class AudioTimeAxisView;
+class AutomationLine;
+class AutomationSelection;
 class AutomationTimeAxisView;
-class AudioRegionView;
+class BundleManager;
+class ControlPoint;
 class CrossfadeView;
-class PluginSelector;
-class PlaylistSelector;
-class Marker;
+class Drag;
+class GlobalPortMatrixWindow;
 class GroupedButtons;
-class AutomationLine;
+class Marker;
+class MidiRegionView;
+class MixerStrip;
+class PlaylistSelector;
+class PluginSelector;
+class RhythmFerret;
 class Selection;
+class SoundFileOmega;
+class StreamView;
 class TempoLines;
+class TimeAxisView;
+class TimeFXDialog;
 class TimeSelection;
-class TrackSelection;
-class AutomationSelection;
-class MixerStrip;
-class StreamView;
-class AudioStreamView;
-class ControlPoint;
-class SoundFileOmega;
-class RhythmFerret;
-class AnalysisWindow;
-class BundleManager;
-class GlobalPortMatrixWindow;
+class EditorGroupTabs;
+class EditorRoutes;
+class EditorRouteGroups;
+class EditorRegions;
+class EditorLocations;
+class EditorSnapshots;
 
 /* <CMT Additions> */
 class ImageFrameView;
@@ -123,21 +140,43 @@ class ImageFrameSocketHandler ;
 class TimeAxisViewItem ;
 /* </CMT Additions> */
 
+struct EditorCursor {
+       Editor&               editor;
+       ArdourCanvas::Points  points;
+       ArdourCanvas::Line    canvas_item;
+       nframes64_t           current_frame;
+       double            length;
 
-class Editor : public PublicEditor
+       EditorCursor (Editor&, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*));
+       ~EditorCursor ();
+
+       void set_position (nframes64_t);
+       void set_length (double units);
+       void set_y_axis (double position);
+
+        PBD::Signal1<void, nframes64_t> PositionChanged;
+};
+
+class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
 {
   public:
        Editor ();
        ~Editor ();
-       
-       void             connect_to_session (ARDOUR::Session *);
-       ARDOUR::Session* current_session() const { return session; }
+
+       void             set_session (ARDOUR::Session *);
+       ARDOUR::Session* session() const { return _session; }
+
        void             first_idle ();
-       virtual bool have_idled() const { return _have_idled; }
+       virtual bool     have_idled () const { return _have_idled; }
 
        nframes64_t leftmost_position() const { return leftmost_frame; }
+
        nframes64_t current_page_frames() const {
-               return (nframes64_t) floor (canvas_width * frames_per_unit);
+               return (nframes64_t) floor (_canvas_width * frames_per_unit);
+       }
+
+       double canvas_height () const {
+               return _canvas_height;
        }
 
        void cycle_snap_mode ();
@@ -146,30 +185,33 @@ class Editor : public PublicEditor
        void set_snap_mode (Editing::SnapMode);
        void set_snap_threshold (double pixel_distance) {snap_threshold = pixel_distance;}
 
+       Editing::SnapMode  snap_mode () const;
+       Editing::SnapType  snap_type () const;
+
        void undo (uint32_t n = 1);
        void redo (uint32_t n = 1);
 
        XMLNode& get_state ();
-       int set_state (const XMLNode& );
+       int set_state (const XMLNode&, int version);
 
        void set_mouse_mode (Editing::MouseMode, bool force=true);
        void step_mouse_mode (bool next);
        Editing::MouseMode current_mouse_mode () const { return mouse_mode; }
-       
-       void set_midi_edit_cursor (Editing::MidiEditMode);
-       void set_midi_edit_mode (Editing::MidiEditMode, bool force=true);
-       Editing::MidiEditMode current_midi_edit_mode () const { return midi_edit_mode; }
+       Editing::MidiEditMode current_midi_edit_mode () const;
+
+       bool internal_editing() const { return _internal_editing ; }
+       void set_internal_edit (bool yn);
 
 #ifdef WITH_CMT
        void add_imageframe_time_axis(const std::string & track_name, void*) ;
        void add_imageframe_marker_time_axis(const std::string & track_name, TimeAxisView* marked_track, void*) ;
        void connect_to_image_compositor() ;
        void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) ;
-#endif
-
        TimeAxisView* get_named_time_axis(const std::string & name) ;
+#endif /* WITH_CMT */
+
        void foreach_time_axis_view (sigc::slot<void,TimeAxisView&>);
-       void add_to_idle_resize (TimeAxisView*, uint32_t);
+       void add_to_idle_resize (TimeAxisView*, int32_t);
 
        RouteTimeAxisView* get_route_view_by_id (PBD::ID& id);
 
@@ -183,14 +225,9 @@ class Editor : public PublicEditor
 
        /* option editor-access */
 
-       void set_show_waveforms (bool yn);
-       bool show_waveforms() const { return _show_waveforms; }
-
-       void set_waveform_scale (Editing::WaveformScale);
-
        void set_show_waveforms_recording (bool yn);
        bool show_waveforms_recording() const { return _show_waveforms_recording; }
-       
+
        /* things that need to be public to be used in the main menubar */
 
        void new_region_from_selection ();
@@ -199,7 +236,6 @@ class Editor : public PublicEditor
        void separate_region_from_punch ();
        void separate_region_from_loop ();
        void separate_regions_using_location (ARDOUR::Location&);
-       void toggle_playback (bool with_abort);
        void transition_to_rolling (bool forward);
 
        /* undo related */
@@ -207,7 +243,7 @@ class Editor : public PublicEditor
        nframes64_t unit_to_frame (double unit) const {
                return (nframes64_t) rint (unit * frames_per_unit);
        }
-       
+
        double frame_to_unit (nframes64_t frame) const {
                return rint ((double) frame / (double) frames_per_unit);
        }
@@ -220,11 +256,11 @@ class Editor : public PublicEditor
           the result of using the world->canvas affine transform on a
           world coordinate. These coordinates already take into
           account any scrolling carried out by adjusting the
-          xscroll_adjustment.  
+          xscroll_adjustment.
        */
 
        nframes64_t pixel_to_frame (double pixel) const {
-               
+
                /* pixel can be less than zero when motion events
                   are processed. since we've already run the world->canvas
                   affine, that means that the location *really* is "off
@@ -258,17 +294,20 @@ class Editor : public PublicEditor
        void invert_selection ();
        void deselect_all ();
 
+       void set_selected_regionview_from_region_list (boost::shared_ptr<ARDOUR::Region> region, Selection::Operation op = Selection::Set);
+
        /* tempo */
 
        void set_show_measures (bool yn);
        bool show_measures () const { return _show_measures; }
 
        /* analysis window */
+
        void analyze_region_selection();
        void analyze_range_selection();
 
        /* export */
-       
+
        void export_audio ();
        void export_selection ();
        void export_range ();
@@ -277,23 +316,23 @@ class Editor : public PublicEditor
        void add_toplevel_controls (Gtk::Container&);
        Gtk::HBox& get_status_bar_packer()  { return status_bar_hpacker; }
 
-       void      set_zoom_focus (Editing::ZoomFocus);
+       void               set_zoom_focus (Editing::ZoomFocus);
        Editing::ZoomFocus get_zoom_focus () const { return zoom_focus; }
-       double   get_current_zoom () const { return frames_per_unit; }
+       double             get_current_zoom () const { return frames_per_unit; }
 
        void temporal_zoom_step (bool coarser);
+       void tav_zoom_step (bool coarser);
 
        /* stuff that AudioTimeAxisView and related classes use */
 
        PlaylistSelector& playlist_selector() const;
-       void route_name_changed (TimeAxisView *);
        void clear_playlist (boost::shared_ptr<ARDOUR::Playlist>);
 
        void new_playlists (TimeAxisView* v);
        void copy_playlists (TimeAxisView* v);
        void clear_playlists (TimeAxisView* v);
 
-       TrackViewList* get_valid_views (TimeAxisView*, ARDOUR::RouteGroup* grp = 0);
+       void get_onscreen_tracks (TrackViewList&);
 
        Width editor_mixer_strip_width;
        void maybe_add_mixer_strip_width (XMLNode&);
@@ -302,10 +341,12 @@ class Editor : public PublicEditor
        void show_editor_list (bool yn);
        void set_selected_mixer_strip (TimeAxisView&);
        void hide_track_in_display (TimeAxisView& tv, bool temporary = false);
-       void show_track_in_display (TimeAxisView& tv);
 
        /* nudge is initiated by transport controls owned by ARDOUR_UI */
 
+       nframes64_t get_nudge_distance (nframes64_t pos, nframes64_t& next);
+       Evoral::MusicalTime get_grid_type_as_beats (bool& success, nframes64_t position);
+
        void nudge_forward (bool next, bool force_playhead);
        void nudge_backward (bool next, bool force_playhead);
 
@@ -315,15 +356,16 @@ class Editor : public PublicEditor
        void nudge_backward_capture_offset ();
 
        /* playhead/screen stuff */
-       
+
        void set_follow_playhead (bool yn);
        void toggle_follow_playhead ();
        bool follow_playhead() const { return _follow_playhead; }
        bool dragging_playhead () const { return _dragging_playhead; }
 
-       void toggle_waveform_visibility ();
        void toggle_zero_line_visibility ();
        void toggle_waveforms_while_recording ();
+       void set_summary ();
+       void set_group_tabs ();
        void toggle_measure_visibility ();
        void toggle_logo_visibility ();
 
@@ -331,36 +373,12 @@ class Editor : public PublicEditor
        double physical_screen_width;
        double physical_screen_height;
 
-       /* SMPTE timecode & video sync */
-
-       void smpte_fps_chosen (ARDOUR::SmpteFormat format);
-       void video_pullup_chosen (ARDOUR::Session::PullupFormat pullup);
-       void subframes_per_frame_chosen (uint32_t);
-
-       void update_smpte_mode();
-       void update_video_pullup();
-       void update_subframes_per_frame ();
-
        /* fades/xfades */
 
-       void toggle_region_fades ();
-       void toggle_region_fades_visible ();
        void toggle_selected_region_fades (int dir);
        void update_region_fade_visibility ();
-       void toggle_auto_xfade ();
-       void toggle_xfades_active ();
-       void toggle_xfade_visibility ();
        bool xfade_visibility() const { return _xfade_visibility; }
        void update_xfade_visibility ();
-       void update_crossfade_model ();
-       void set_crossfade_model (ARDOUR::CrossfadeModel);
-
-       /* layers */
-       void set_layer_model (ARDOUR::LayerModel);
-       void update_layering_model ();
-       
-       void toggle_link_region_and_track_selection ();
-       void toggle_automation_follows_regions ();
 
        /* redirect shared ops menu. caller must free returned menu */
 
@@ -375,8 +393,6 @@ class Editor : public PublicEditor
        void scroll_tracks_down_line ();
        void scroll_tracks_up_line ();
 
-       void move_selected_tracks (bool up);
-
        bool new_regionviews_display_gain () { return _new_regionviews_show_envelope; }
        void prepare_for_cleanup ();
        void finish_cleanup ();
@@ -385,6 +401,7 @@ class Editor : public PublicEditor
        void restore_editing_space();
 
        void reset_x_origin (nframes64_t);
+       void reset_y_origin (double);
        void reset_zoom (double);
        void reposition_and_zoom (nframes64_t, double);
 
@@ -396,33 +413,44 @@ class Editor : public PublicEditor
        void toggle_meter_updating();
 
        void show_rhythm_ferret();
-       void show_bundle_manager ();
        void show_global_port_matrix (ARDOUR::DataType);
 
        void goto_visual_state (uint32_t);
        void save_visual_state (uint32_t);
 
-       void queue_draw_resize_line (int at);
-       void start_resize_line_ops ();
-       void end_resize_line_ops ();
+       TrackViewList const & get_track_views () {
+               return track_views;
+       }
+
+       int get_regionview_count_from_region_list (boost::shared_ptr<ARDOUR::Region>);
+
+       void do_import (std::vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&);
+       void do_embed (std::vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode,  nframes64_t&);
+
+       void get_regions_corresponding_to (boost::shared_ptr<ARDOUR::Region> region, std::vector<RegionView*>& regions);
+
+       void show_verbose_canvas_cursor_with (const std::string& txt);
+       void hide_verbose_canvas_cursor();
+
+       void center_screen (nframes64_t);
+
+       TrackViewList axis_views_from_routes (boost::shared_ptr<ARDOUR::RouteList>) const;
 
   protected:
        void map_transport_state ();
        void map_position_change (nframes64_t);
 
        void on_realize();
-       bool on_expose_event (GdkEventExpose*);
 
   private:
 
-       /// The session that we are editing, or 0
        void color_handler ();
-       ARDOUR::Session     *session;
+
        bool                 constructed;
 
        // to keep track of the playhead position for control_scroll
        boost::optional<nframes64_t> _control_scroll_target;
+
        PlaylistSelector* _playlist_selector;
 
        typedef std::pair<TimeAxisView*,XMLNode*> TAVState;
@@ -432,10 +460,9 @@ class Editor : public PublicEditor
            double              frames_per_unit;
            nframes64_t         leftmost_frame;
            Editing::ZoomFocus  zoom_focus;
-           bool                zoomed_to_region;
            std::list<TAVState> track_states;
        };
-       
+
        std::list<VisualState*> undo_visual_stack;
        std::list<VisualState*> redo_visual_stack;
        VisualState* current_visual_state (bool with_tracks = true);
@@ -444,7 +471,7 @@ class Editor : public PublicEditor
        void use_visual_state (VisualState&);
        bool no_save_visual;
        void swap_visual_state ();
-       
+
        std::vector<VisualState*> visual_states;
        sigc::connection visual_state_op_connection;
        void start_visual_state_op (uint32_t n);
@@ -459,7 +486,7 @@ class Editor : public PublicEditor
        void post_zoom ();
 
        Editing::MouseMode mouse_mode;
-       Editing::MidiEditMode midi_edit_mode;
+       bool _internal_editing;
 
        int  post_maximal_editor_width;
        int  post_maximal_pane_position;
@@ -499,12 +526,12 @@ class Editor : public PublicEditor
            bool    valid;
 
            LocationMarkers () : start(0), end(0), valid (true) {}
-           
+
            ~LocationMarkers ();
 
            void hide();
            void show ();
-           void set_name (const string&);
+           void set_name (const std::string&);
            void set_position (nframes64_t start, nframes64_t end = 0);
            void set_color_rgba (uint32_t);
        };
@@ -519,33 +546,33 @@ class Editor : public PublicEditor
        void hide_marker (ArdourCanvas::Item*, GdkEvent*);
        void clear_marker_display ();
        void mouse_add_new_marker (nframes64_t where, bool is_cd=false, bool is_xrun=false);
-       bool choose_new_marker_name(string &name);
+       bool choose_new_marker_name(std::string &name);
        void update_cd_marker_display ();
        void ensure_cd_marker_updated (LocationMarkers * lam, ARDOUR::Location * location);
 
        TimeAxisView*      clicked_axisview;
        RouteTimeAxisView* clicked_routeview;
-        /** The last RegionView that was clicked on, or 0 if the last click was not
-         * on a RegionView.  This is set up by the canvas event handlers in
-         * editor_canvas_events.cc
-         */
+       /** The last RegionView that was clicked on, or 0 if the last click was not
+        * on a RegionView.  This is set up by the canvas event handlers in
+        * editor_canvas_events.cc
+        */
        RegionView*        clicked_regionview;
        RegionSelection    latest_regionviews;
        uint32_t           clicked_selection;
        CrossfadeView*     clicked_crossfadeview;
        ControlPoint*      clicked_control_point;
 
-       void sort_track_selection (TrackSelection* sel = 0);
+       void sort_track_selection (TrackViewList* sel = 0);
 
-       void get_relevant_tracks (std::set<RouteTimeAxisView*>& relevant_tracks);
-       void get_equivalent_regions (RegionView* rv, std::vector<RegionView*>&) const;
-       void mapover_tracks (sigc::slot<void,RouteTimeAxisView&,uint32_t> sl, TimeAxisView*) const;
+       void get_equivalent_regions (RegionView* rv, std::vector<RegionView*> &, ARDOUR::RouteGroup::Property) const;
+       RegionSelection get_equivalent_regions (RegionSelection &, ARDOUR::RouteGroup::Property) const;
+       void mapover_tracks (sigc::slot<void,RouteTimeAxisView&,uint32_t> sl, TimeAxisView*, ARDOUR::RouteGroup::Property) const;
 
        /* functions to be passed to mapover_tracks(), possibly with sigc::bind()-supplied arguments */
 
-       void mapped_get_equivalent_regions (RouteTimeAxisView&, uint32_t, RegionView*, vector<RegionView*>*) const;
-       void mapped_use_new_playlist (RouteTimeAxisView&, uint32_t, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
-       void mapped_use_copy_playlist (RouteTimeAxisView&, uint32_t, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
+       void mapped_get_equivalent_regions (RouteTimeAxisView&, uint32_t, RegionView *, std::vector<RegionView*>*) const;
+       void mapped_use_new_playlist (RouteTimeAxisView&, uint32_t, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
+       void mapped_use_copy_playlist (RouteTimeAxisView&, uint32_t, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
        void mapped_clear_playlist (RouteTimeAxisView&, uint32_t);
 
        /* end */
@@ -557,19 +584,16 @@ class Editor : public PublicEditor
 
        void set_selected_track (TimeAxisView&, Selection::Operation op = Selection::Set, bool no_remove=false);
        void select_all_tracks ();
-       
-       int get_regionview_count_from_region_list (boost::shared_ptr<ARDOUR::Region> region);
-       
+
        bool set_selected_control_point_from_click (Selection::Operation op = Selection::Set, bool no_remove=false);
        void set_selected_track_from_click (bool press, Selection::Operation op = Selection::Set, bool no_remove=false);
        void set_selected_track_as_side_effect (bool force = false);
        bool set_selected_regionview_from_click (bool press, Selection::Operation op = Selection::Set, bool no_track_remove=false);
 
-       void set_selected_regionview_from_region_list (boost::shared_ptr<ARDOUR::Region> region, Selection::Operation op = Selection::Set);
        bool set_selected_regionview_from_map_event (GdkEventAny*, StreamView*, boost::weak_ptr<ARDOUR::Region>);
        void collect_new_region_view (RegionView *);
        void collect_and_select_new_region_view (RegionView *);
-       
+
        Gtk::Menu track_context_menu;
        Gtk::Menu track_region_context_menu;
        Gtk::Menu track_selection_context_menu;
@@ -593,50 +617,41 @@ class Editor : public PublicEditor
        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&);
 
-       void add_item_with_sensitivity (Gtk::Menu_Helpers::MenuList&, Gtk::Menu_Helpers::MenuElem, bool) const;
-
        void handle_new_route (ARDOUR::RouteList&);
-       void remove_route (TimeAxisView *);
-       bool route_removal;
+       void timeaxisview_deleted (TimeAxisView *);
 
        Gtk::HBox           global_hpacker;
        Gtk::VBox           global_vpacker;
        Gtk::VBox           vpacker;
 
-       bool need_resize_line;
-       int  resize_line_y;
-       int  old_resize_line_y;
-
        Gdk::Cursor*          current_canvas_cursor;
        void set_canvas_cursor ();
        Gdk::Cursor* which_grabber_cursor ();
 
        ArdourCanvas::Canvas* track_canvas;
 
-       ArdourCanvas::Text* first_action_message;
-       ArdourCanvas::Text* verbose_canvas_cursor;
+       ArdourCanvas::NoEventText* verbose_canvas_cursor;
        bool                 verbose_cursor_visible;
 
-       void parameter_changed (const char *);
-       
+       void parameter_changed (std::string);
+
        bool track_canvas_motion (GdkEvent*);
 
-       void set_verbose_canvas_cursor (const string &, double x, double y);
-       void set_verbose_canvas_cursor_text (const string &);
+       void set_verbose_canvas_cursor (const std::string &, double x, double y);
+       void set_verbose_canvas_cursor_text (const std::string &);
        void show_verbose_canvas_cursor();
-       void hide_verbose_canvas_cursor();
 
        bool verbose_cursor_on; // so far unused
 
-       Gtk::EventBox      time_canvas_event_box;
-       Gtk::EventBox      track_canvas_event_box;
-       Gtk::EventBox      time_button_event_box;
-       Gtk::EventBox      ruler_label_event_box;
+       Gtk::EventBox             time_canvas_event_box;
+       Gtk::EventBox             track_canvas_event_box;
+       Gtk::EventBox             time_button_event_box;
+       Gtk::EventBox             ruler_label_event_box;
 
        ArdourCanvas::Group      *minsec_group;
        ArdourCanvas::Pixbuf     *logo_item;
        ArdourCanvas::Group      *bbt_group;
-       ArdourCanvas::Group      *smpte_group;
+       ArdourCanvas::Group      *timecode_group;
        ArdourCanvas::Group      *frame_group;
        ArdourCanvas::Group      *tempo_group;
        ArdourCanvas::Group      *meter_group;
@@ -657,22 +672,22 @@ class Editor : public PublicEditor
 
        /** The group containing all items that require horizontal scrolling. */
        ArdourCanvas::Group* _background_group;
-       /* 
+       /*
           The _master_group is the group containing all items
           that require horizontal scrolling..
-          It is primarily used to separate canvas items 
-          that require horizontal scrolling from those that do not. 
+          It is primarily used to separate canvas items
+          that require horizontal scrolling from those that do not.
        */
        ArdourCanvas::Group* _master_group;
 
        /* The group containing all trackviews.  Only scrolled vertically. */
        ArdourCanvas::Group* _trackview_group;
-       
+
        /* The group used for region motion.  Sits on top of _trackview_group */
        ArdourCanvas::Group* _region_motion_group;
-       
+
        enum RulerType {
-               ruler_metric_smpte = 0,
+               ruler_metric_timecode = 0,
                ruler_metric_bbt = 1,
                ruler_metric_frames = 2,
                ruler_metric_minsec = 3,
@@ -696,21 +711,20 @@ class Editor : public PublicEditor
        Glib::RefPtr<Gtk::ToggleAction> ruler_range_action;
        Glib::RefPtr<Gtk::ToggleAction> ruler_loop_punch_action;
        Glib::RefPtr<Gtk::ToggleAction> ruler_cd_marker_action;
-       bool                   no_ruler_shown_update;
-       
+       bool                            no_ruler_shown_update;
+
        gint ruler_button_press (GdkEventButton*);
        gint ruler_button_release (GdkEventButton*);
        gint ruler_mouse_motion (GdkEventMotion*);
        bool ruler_scroll (GdkEventScroll* event);
 
-       gint ruler_pressed_button;
        Gtk::Widget * ruler_grabbed_widget;
-       
+
        void initialize_rulers ();
-       void update_just_smpte ();
+       void update_just_timecode ();
        void compute_fixed_ruler_scale (); //calculates the RulerScale of the fixed rulers
        void update_fixed_rulers ();
-       void update_tempo_based_rulers (); 
+       void update_tempo_based_rulers ();
        void popup_ruler_menu (nframes64_t where = 0, ItemType type = RegionItem);
        void update_ruler_visibility ();
        void set_ruler_visible (RulerType, bool);
@@ -719,12 +733,12 @@ class Editor : public PublicEditor
        gint ruler_label_button_release (GdkEventButton*);
        void store_ruler_visibility ();
        void restore_ruler_visibility ();
-       
-       static gint _metric_get_smpte (GtkCustomRulerMark **, gdouble, gdouble, gint);
+
+       static gint _metric_get_timecode (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);
-       
+
        enum MinsecRulerScale {
                minsec_show_seconds,
                minsec_show_minutes,
@@ -739,20 +753,20 @@ class Editor : public PublicEditor
        gint minsec_nmarks;
        void set_minsec_ruler_scale (gdouble lower, gdouble upper);
 
-       enum SMPTERulerScale {
-               smpte_show_bits,
-               smpte_show_frames,
-               smpte_show_seconds,
-               smpte_show_minutes,
-               smpte_show_hours
+       enum TimecodeRulerScale {
+               timecode_show_bits,
+               timecode_show_frames,
+               timecode_show_seconds,
+               timecode_show_minutes,
+               timecode_show_hours
        };
 
-       SMPTERulerScale smpte_ruler_scale;
+       TimecodeRulerScale timecode_ruler_scale;
 
-       nframes_t smpte_mark_interval;
-       gint smpte_mark_modulo;
-       gint smpte_nmarks;
-       void set_smpte_ruler_scale (gdouble lower, gdouble upper);
+       nframes_t timecode_mark_interval;
+       gint timecode_mark_modulo;
+       gint timecode_nmarks;
+       void set_timecode_ruler_scale (gdouble lower, gdouble upper);
 
        enum BBTRulerScale {
                bbt_over,
@@ -774,17 +788,17 @@ class Editor : public PublicEditor
        uint32_t bbt_accent_modulo;
        void compute_bbt_ruler_scale (nframes64_t lower, nframes64_t upper);
 
-       gint metric_get_smpte (GtkCustomRulerMark **, gdouble, gdouble, gint);
+       gint metric_get_timecode (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);
 
        Gtk::Widget        *_ruler_separator;
-       GtkWidget          *_smpte_ruler;
+       GtkWidget          *_timecode_ruler;
        GtkWidget          *_bbt_ruler;
        GtkWidget          *_frames_ruler;
        GtkWidget          *_minsec_ruler;
-       Gtk::Widget        *smpte_ruler;
+       Gtk::Widget        *timecode_ruler;
        Gtk::Widget        *bbt_ruler;
        Gtk::Widget        *frames_ruler;
        Gtk::Widget        *minsec_ruler;
@@ -795,17 +809,17 @@ class Editor : public PublicEditor
        gdouble canvas_timebars_vsize;
        gdouble get_canvas_timebars_vsize () const { return canvas_timebars_vsize; }
        Gtk::Menu          *editor_ruler_menu;
-       
+
        ArdourCanvas::SimpleRect* tempo_bar;
        ArdourCanvas::SimpleRect* meter_bar;
        ArdourCanvas::SimpleRect* marker_bar;
        ArdourCanvas::SimpleRect* range_marker_bar;
        ArdourCanvas::SimpleRect* transport_marker_bar;
        ArdourCanvas::SimpleRect* cd_marker_bar;
-       
+
        Gtk::Label  minsec_label;
        Gtk::Label  bbt_label;
-       Gtk::Label  smpte_label;
+       Gtk::Label  timecode_label;
        Gtk::Label  frame_label;
        Gtk::Label  tempo_label;
        Gtk::Label  meter_label;
@@ -813,52 +827,36 @@ class Editor : public PublicEditor
        Gtk::Label  range_mark_label;
        Gtk::Label  transport_mark_label;
        Gtk::Label  cd_mark_label;
-       
 
        Gtk::VBox          time_button_vbox;
        Gtk::HBox          time_button_hbox;
 
-       struct Cursor {
-           Editor&               editor;
-           ArdourCanvas::Points  points;
-           ArdourCanvas::Line    canvas_item;
-           nframes64_t           current_frame;
-           double                length;
-
-           Cursor (Editor&, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*));
-           ~Cursor ();
+       friend class EditorCursor;
 
-           void set_position (nframes64_t);
-           void set_length (double units);
-           void set_y_axis (double position);
-       };
+       EditorCursor*        playhead_cursor;
+       ArdourCanvas::Group* cursor_group;
 
-       friend struct Cursor; /* it needs access to several private
-                                fields. XXX fix me.
-                             */
+       nframes64_t get_region_boundary (nframes64_t pos, int32_t dir, bool with_selection, bool only_onscreen);
 
-       Cursor* playhead_cursor;
-       ArdourCanvas::Group* cursor_group;
+       void    cursor_to_region_boundary (bool with_selection, int32_t dir);
+       void    cursor_to_next_region_boundary (bool with_selection);
+       void    cursor_to_previous_region_boundary (bool with_selection);
+       void    cursor_to_next_region_point (EditorCursor*, ARDOUR::RegionPoint);
+       void    cursor_to_previous_region_point (EditorCursor*, ARDOUR::RegionPoint);
+       void    cursor_to_region_point (EditorCursor*, ARDOUR::RegionPoint, int32_t dir);
+       void    cursor_to_selection_start (EditorCursor *);
+       void    cursor_to_selection_end   (EditorCursor *);
 
-       void    cursor_to_region_boundary (Cursor*, int32_t dir);
-       void    cursor_to_next_region_boundary (Cursor*);
-       void    cursor_to_previous_region_boundary (Cursor*);
-       void    cursor_to_next_region_point (Cursor*, ARDOUR::RegionPoint);
-       void    cursor_to_previous_region_point (Cursor*, ARDOUR::RegionPoint);
-       void    cursor_to_region_point (Cursor*, ARDOUR::RegionPoint, int32_t dir);
-       void    cursor_to_selection_start (Cursor *);
-       void    cursor_to_selection_end   (Cursor *);
-
-       void    selected_marker_to_region_boundary (int32_t dir);
-       void    selected_marker_to_next_region_boundary ();
-       void    selected_marker_to_previous_region_boundary ();
+       void    selected_marker_to_region_boundary (bool with_selection, int32_t dir);
+       void    selected_marker_to_next_region_boundary (bool with_selection);
+       void    selected_marker_to_previous_region_boundary (bool with_selection);
        void    selected_marker_to_next_region_point (ARDOUR::RegionPoint);
        void    selected_marker_to_previous_region_point (ARDOUR::RegionPoint);
        void    selected_marker_to_region_point (ARDOUR::RegionPoint, int32_t dir);
        void    selected_marker_to_selection_start ();
        void    selected_marker_to_selection_end   ();
 
-       void    select_all_selectables_using_cursor (Cursor *, bool);
+       void    select_all_selectables_using_cursor (EditorCursor *, bool);
        void    select_all_selectables_using_edit (bool);
        void    select_all_selectables_between (bool within);
        void    select_range_between ();
@@ -866,14 +864,13 @@ class Editor : public PublicEditor
        boost::shared_ptr<ARDOUR::Region> find_next_region (nframes64_t, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView ** = 0);
        nframes64_t find_next_region_boundary (nframes64_t, int32_t dir, const TrackViewList&);
 
-       vector<nframes64_t> region_boundary_cache;
+       std::vector<nframes64_t> region_boundary_cache;
        void build_region_boundary_cache ();
 
        Gtk::HBox           top_hbox;
        Gtk::HBox           bottom_hbox;
-       
+
        Gtk::Table          edit_packer;
-       Gtk::VScrollbar     edit_vscrollbar;
 
        Gtk::Adjustment     vertical_adjustment;
        Gtk::Adjustment     horizontal_adjustment;
@@ -883,17 +880,11 @@ class Editor : public PublicEditor
        void controls_layout_size_request (Gtk::Requisition*);
        sigc::connection controls_layout_size_request_connection;
 
-       Gtk::HScrollbar     edit_hscrollbar;
-       bool                _dragging_hscrollbar;
+       void horizontal_scroll_left ();
+       void horizontal_scroll_right ();
 
-       void reset_hscrollbar_stepping ();
-       
-       bool hscrollbar_button_press (GdkEventButton*);
-       bool hscrollbar_button_release (GdkEventButton*);
-       void hscrollbar_allocate (Gtk::Allocation &alloc);
-
-       double canvas_width;
-       double canvas_height;
+       double _canvas_width;
+       double _canvas_height;
        double full_canvas_height;
 
        bool track_canvas_map_handler (GdkEventAny*);
@@ -914,29 +905,32 @@ class Editor : public PublicEditor
        sigc::connection control_scroll_connection;
 
        gdouble get_trackview_group_vertical_offset () const { return vertical_adjustment.get_value () - canvas_timebars_vsize;}
-       
+
        ArdourCanvas::Group* get_background_group () const { return _background_group; }
        ArdourCanvas::Group* get_trackview_group () const { return _trackview_group; }
        double last_trackview_group_vertical_offset;
        void tie_vertical_scrolling ();
        void scroll_canvas_horizontally ();
        void scroll_canvas_vertically ();
-       void canvas_horizontally_scrolled ();
-       void canvas_scroll_to (nframes64_t);
 
        struct VisualChange {
-           enum Type { 
-                   TimeOrigin = 0x1,
-                   ZoomLevel = 0x2
-           };
-
-           Type pending;
-           nframes64_t time_origin;
-           double frames_per_unit;
-
-           int idle_handler_id;
-
-           VisualChange() : pending ((VisualChange::Type) 0), time_origin (0), frames_per_unit (0), idle_handler_id (-1) {}
+               enum Type {
+                       TimeOrigin = 0x1,
+                       ZoomLevel = 0x2,
+                       YOrigin = 0x4
+               };
+
+               Type pending;
+               nframes64_t time_origin;
+               double frames_per_unit;
+               double y_origin;
+
+               int idle_handler_id;
+
+               VisualChange() : pending ((VisualChange::Type) 0), time_origin (0), frames_per_unit (0), idle_handler_id (-1) {}
+               void add (Type t) {
+                       pending = Type (pending | t);
+               }
        };
 
 
@@ -947,140 +941,17 @@ class Editor : public PublicEditor
 
        void queue_visual_change (nframes64_t);
        void queue_visual_change (double);
+       void queue_visual_change_y (double);
+       void ensure_visual_change_idle_handler ();
 
        void end_location_changed (ARDOUR::Location*);
 
-       struct RegionListDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
-           RegionListDisplayModelColumns() {
-                       add (name);
-                   add (region);
-                   add (color_);
-                   add (start);
-                   add (end);
-                   add (length);
-                       add (sync);
-                       add (fadein);
-                       add (fadeout);
-                       add (locked);
-                       add (glued);
-                       add (muted);
-                       add (opaque);
-                       add (used);
-                   add (path);
-           }
-           Gtk::TreeModelColumn<Glib::ustring> name;
-           Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Region> > region;
-           Gtk::TreeModelColumn<Gdk::Color> color_;
-           Gtk::TreeModelColumn<Glib::ustring> start;
-           Gtk::TreeModelColumn<Glib::ustring> end;
-           Gtk::TreeModelColumn<Glib::ustring> length;
-           Gtk::TreeModelColumn<Glib::ustring> sync;
-           Gtk::TreeModelColumn<Glib::ustring> fadein;
-           Gtk::TreeModelColumn<Glib::ustring> fadeout;
-           Gtk::TreeModelColumn<bool> locked;
-           Gtk::TreeModelColumn<bool> glued;
-           Gtk::TreeModelColumn<bool> muted;
-           Gtk::TreeModelColumn<bool> opaque;
-           Gtk::TreeModelColumn<Glib::ustring> used;
-           Gtk::TreeModelColumn<Glib::ustring> path;
-       };
-           
-       RegionListDisplayModelColumns          region_list_columns;
-       Gtkmm2ext::DnDTreeView<boost::shared_ptr<ARDOUR::Region> > region_list_display;
-       
-       Glib::RefPtr<Gtk::TreeStore>           region_list_model;
-       Glib::RefPtr<Gtk::ToggleAction>        toggle_full_region_list_action;
-       Glib::RefPtr<Gtk::ToggleAction>        toggle_show_auto_regions_action;
-
-       void region_list_region_changed (ARDOUR::Change, boost::weak_ptr<ARDOUR::Region>);
-       void region_list_selection_changed ();
-       sigc::connection region_list_change_connection;
-       void set_selected_in_region_list(RegionSelection&);
-       bool set_selected_in_region_list_subrow(boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &, int);
-       bool region_list_selection_filter (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::Path& path, bool yn);
-       void region_name_edit (const Glib::ustring&, const Glib::ustring&);
-       void get_regions_corresponding_to (boost::shared_ptr<ARDOUR::Region> region, std::vector<RegionView*>& regions);
-
-       Gtk::Menu          *region_list_menu;
-       Gtk::ScrolledWindow region_list_scroller;
-       Gtk::Frame          region_list_frame;
-
-       bool region_list_display_key_press (GdkEventKey *);
-       bool region_list_display_key_release (GdkEventKey *);
-       bool region_list_display_button_press (GdkEventButton *);
-       bool region_list_display_button_release (GdkEventButton *);
-       void region_list_clear ();
-       void region_list_selection_mapover (sigc::slot<void,boost::shared_ptr<ARDOUR::Region> >);
-       void build_region_list_menu ();
-       void show_region_list_display_context_menu (int button, int time);
-
-       bool show_automatic_regions_in_region_list;
-       Editing::RegionListSortType region_list_sort_type;
-
-       void reset_region_list_sort_direction (bool);
-       void reset_region_list_sort_type (Editing::RegionListSortType);
-
-       void toggle_full_region_list ();
-       void toggle_show_auto_regions ();
-
-       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;
-       Gtk::Menu snapshot_context_menu;
-
-       bool snapshot_display_button_press (GdkEventButton*);
-       void snapshot_display_selection_changed ();
-       void redisplay_snapshots();
-       void popup_snapshot_context_menu (int, int32_t, Glib::ustring);
-
-       /* named selections */
-
-       struct NamedSelectionDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
-           NamedSelectionDisplayModelColumns() { 
-                   add (text);
-                   add (selection);
-           }
-           Gtk::TreeModelColumn<Glib::ustring>  text;
-           Gtk::TreeModelColumn<ARDOUR::NamedSelection*>    selection;
-       };
-
-       NamedSelectionDisplayModelColumns named_selection_columns;
-       Glib::RefPtr<Gtk::TreeStore>     named_selection_model;
-
-       Gtkmm2ext::DnDTreeView<ARDOUR::NamedSelection*> named_selection_display;
-       Gtk::ScrolledWindow    named_selection_scroller;
-
-       void create_named_selection ();
-       void paste_named_selection (float times);
-       void remove_selected_named_selections ();
-       void remove_snapshot (Glib::ustring);
-       void rename_snapshot (Glib::ustring);
-
-       void handle_new_named_selection ();
-       void add_named_selection_to_named_selection_display (ARDOUR::NamedSelection&);
-       void redisplay_named_selections ();
-
-       bool named_selection_display_button_release (GdkEventButton *ev);
-       bool named_selection_display_key_release (GdkEventKey *ev);
-       void named_selection_display_selection_changed ();
-
        /* track views */
-       TrackViewList  track_views;
+       TrackViewList track_views;
        std::pair<TimeAxisView*, ARDOUR::layer_t> trackview_by_y_position (double);
+       TimeAxisView* axis_view_from_route (boost::shared_ptr<ARDOUR::Route>) const;
+
+       TrackViewList get_tracks_for_range_action () const;
 
        static Gdk::Cursor* cross_hair_cursor;
        static Gdk::Cursor* trimmer_cursor;
@@ -1103,11 +974,10 @@ class Editor : public PublicEditor
 
        sigc::connection scroll_connection;
        nframes64_t last_update_frame;
-       void center_screen (nframes64_t);
        void center_screen_internal (nframes64_t, float);
-       
+
        void update_current_screen ();
-       
+
        void session_going_away ();
 
        nframes64_t cut_buffer_start;
@@ -1115,45 +985,31 @@ class Editor : public PublicEditor
 
        bool typed_event (ArdourCanvas::Item*, GdkEvent*, ItemType);
        bool button_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
+       bool button_press_handler_1 (ArdourCanvas::Item *, GdkEvent *, ItemType);
+       bool button_press_handler_2 (ArdourCanvas::Item *, GdkEvent *, ItemType);
        bool button_release_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
-       bool motion_handler (ArdourCanvas::Item*, GdkEvent*, ItemType, bool from_autoscroll = false);
+       bool motion_handler (ArdourCanvas::Item*, GdkEvent*, bool from_autoscroll = false);
        bool enter_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
        bool leave_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
-       
+
        /* KEYMAP HANDLING */
 
        void register_actions ();
 
        int ensure_cursor (nframes64_t* pos);
 
-       void handle_new_region (boost::weak_ptr<ARDOUR::Region>);
-       void handle_new_regions (vector<boost::weak_ptr<ARDOUR::Region> >& );
-       void handle_region_removed (boost::weak_ptr<ARDOUR::Region>);
-       void add_region_to_region_display (boost::shared_ptr<ARDOUR::Region>);
-       void add_regions_to_region_display (std::vector<boost::weak_ptr<ARDOUR::Region> > & );
-       void region_hidden (boost::shared_ptr<ARDOUR::Region>);
-       void redisplay_regions ();
-       void populate_row (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &);
-       void update_region_row (boost::shared_ptr<ARDOUR::Region>);
-       bool update_region_subrows (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &, int);
-       void update_all_region_rows ();
-       void update_all_region_subrows (Gtk::TreeModel::Row const &, int);
-       bool no_region_list_redisplay;
-       void insert_into_tmp_regionlist(boost::shared_ptr<ARDOUR::Region>);
-
-       list<boost::shared_ptr<ARDOUR::Region> > tmp_region_list;
-
        void cut_copy (Editing::CutCopyOp);
        bool can_cut_copy () const;
        void cut_copy_points (Editing::CutCopyOp);
        void cut_copy_regions (Editing::CutCopyOp, RegionSelection&);
        void cut_copy_ranges (Editing::CutCopyOp);
+       void cut_copy_midi (Editing::CutCopyOp);
 
        void mouse_paste ();
        void paste_internal (nframes64_t position, float times);
 
        /* EDITING OPERATIONS */
-       
+
        void reset_point_selection ();
        void toggle_region_mute ();
        void toggle_region_lock ();
@@ -1164,8 +1020,6 @@ class Editor : public PublicEditor
        void raise_region_to_top ();
        void lower_region ();
        void lower_region_to_bottom ();
-       void split_region ();
-       void split_region_at (nframes64_t);
        void split_regions_at (nframes64_t, RegionSelection&);
        void split_region_at_transients ();
        void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&, bool can_ferret);
@@ -1181,6 +1035,7 @@ class Editor : public PublicEditor
        void remove_selected_regions ();
        void remove_clicked_region ();
        void edit_region ();
+       void show_midi_list_editor ();
        void rename_region ();
        void duplicate_some_regions (RegionSelection&, float times);
        void duplicate_selection (float times);
@@ -1191,13 +1046,15 @@ class Editor : public PublicEditor
        void audition_playlist_region_via_route (boost::shared_ptr<ARDOUR::Region>, ARDOUR::Route&);
        void split_multichannel_region();
        void reverse_region ();
+       void strip_region_silence ();
        void normalize_region ();
-       void denormalize_region ();
+       double _last_normalization_value;
+       void reset_region_scale_amplitude ();
        void adjust_region_scale_amplitude (bool up);
        void quantize_region ();
 
        void do_insert_time ();
-       void insert_time (nframes64_t pos, nframes64_t distance, Editing::InsertTimeOption opt, bool ignore_music_glue, bool markers_too);
+       void insert_time (nframes64_t, nframes64_t, Editing::InsertTimeOption, bool, bool, bool);
 
        void tab_to_transient (bool forward);
 
@@ -1208,7 +1065,6 @@ class Editor : public PublicEditor
 
        void audition_region_from_region_list ();
        void hide_region_from_region_list ();
-       void remove_region_from_region_list ();
 
        void align (ARDOUR::RegionPoint);
        void align_relative (ARDOUR::RegionPoint);
@@ -1241,11 +1097,10 @@ class Editor : public PublicEditor
 
        void temporal_zoom_selection ();
        void temporal_zoom_region (bool both_axes);
-       void toggle_zoom_region (bool both_axes);
-       bool zoomed_to_region;
+       void zoom_to_region (bool both_axes);
        void temporal_zoom_session ();
        void temporal_zoom (gdouble scale);
-       void temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string & op);
+       void temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const std::string & op);
        void temporal_zoom_to_frame (bool coarser, nframes64_t frame);
 
        void amplitude_zoom (gdouble scale);
@@ -1257,30 +1112,27 @@ class Editor : public PublicEditor
        void insert_route_list_drag (boost::shared_ptr<ARDOUR::Route>, int x, int y);
 
        /* import & embed */
-       
+
        void add_external_audio_action (Editing::ImportMode);
        void external_audio_dialog ();
        void session_import_dialog ();
 
-       int  check_whether_and_how_to_import(string, bool all_or_nothing = true);
+       int  check_whether_and_how_to_import(std::string, bool all_or_nothing = true);
        bool check_multichannel_status (const std::vector<Glib::ustring>& paths);
 
        SoundFileOmega* sfbrowser;
-       
+
        void bring_in_external_audio (Editing::ImportMode mode,  nframes64_t& pos);
 
        bool  idle_drop_paths  (std::vector<Glib::ustring> paths, nframes64_t frame, double ypos);
        void  drop_paths_part_two  (const std::vector<Glib::ustring>& paths, nframes64_t frame, double ypos);
-       
-       void do_import (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&);
-       void do_embed (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode,  nframes64_t&);
 
-       int  import_sndfiles (vector<Glib::ustring> paths, Editing::ImportMode mode,  ARDOUR::SrcQuality, nframes64_t& pos,
+       int  import_sndfiles (std::vector<Glib::ustring> paths, Editing::ImportMode mode,  ARDOUR::SrcQuality, nframes64_t& pos,
                              int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>, bool, uint32_t total);
-       int  embed_sndfiles (vector<Glib::ustring> paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, 
+       int  embed_sndfiles (std::vector<Glib::ustring> paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode,
                             nframes64_t& pos, int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&);
 
-       int add_sources (vector<Glib::ustring> paths, ARDOUR::SourceList& sources, nframes64_t& pos, Editing::ImportMode,
+       int add_sources (std::vector<Glib::ustring> paths, ARDOUR::SourceList& sources, nframes64_t& pos, Editing::ImportMode,
                         int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&, bool add_channel_suffix);
        int finish_bringing_in_material (boost::shared_ptr<ARDOUR::Region> region, uint32_t, uint32_t,  nframes64_t& pos, Editing::ImportMode mode,
                                      boost::shared_ptr<ARDOUR::Track>& existing_track);
@@ -1289,7 +1141,7 @@ class Editor : public PublicEditor
        boost::shared_ptr<ARDOUR::MidiTrack> get_nth_selected_midi_track (int nth) const;
 
        /* generic interthread progress window */
-       
+
        ArdourDialog* interthread_progress_window;
        Gtk::Label interthread_progress_label;
        Gtk::VBox interthread_progress_vbox;
@@ -1305,7 +1157,7 @@ class Editor : public PublicEditor
 
        /* import specific info */
 
-       struct EditorImportStatus : public ARDOUR::Session::ImportStatus {
+       struct EditorImportStatus : public ARDOUR::ImportStatus {
            Editing::ImportMode mode;
            nframes64_t pos;
            int target_tracks;
@@ -1323,7 +1175,7 @@ class Editor : public PublicEditor
        /* to support this ... */
 
        void import_audio (bool as_tracks);
-       void do_import (vector<Glib::ustring> paths, bool split, bool as_tracks);
+       void do_import (std::vector<Glib::ustring> paths, bool split, bool as_tracks);
 
        void move_to_start ();
        void move_to_end ();
@@ -1389,7 +1241,6 @@ class Editor : public PublicEditor
        void start_scrolling ();
        void stop_scrolling ();
 
-       bool _scrubbing;
        double last_scrub_x;
        int scrubbing_direction;
        int scrub_reversals;
@@ -1405,93 +1256,44 @@ class Editor : public PublicEditor
        void extend_selection_to_end_of_region (bool next);
        void extend_selection_to_start_of_region (bool previous);
 
-       Editing::SnapType snap_type;
-       Editing::SnapMode snap_mode;
+       Editing::SnapType _snap_type;
+       Editing::SnapMode _snap_mode;
 
        /// Snap threshold in pixels
        double snap_threshold;
 
-       void handle_gui_changes (const string &, void *);
        bool ignore_gui_changes;
 
-       void    hide_all_tracks (bool with_select);
+       Drag* _drag;
 
-       DragInfo drag_info;
-       LineDragInfo current_line_drag_info;
-
-       void start_grab (GdkEvent*, Gdk::Cursor* cursor = 0);
-       bool end_grab (ArdourCanvas::Item*, GdkEvent*);
-       void swap_grab (ArdourCanvas::Item*, Gdk::Cursor* cursor, uint32_t time);
        void break_drag ();
-       void finalize_drag ();
 
        Gtk::Menu fade_context_menu;
        void popup_fade_context_menu (int, int, ArdourCanvas::Item*, ItemType);
 
-       void region_gain_motion_callback (ArdourCanvas::Item*, GdkEvent*);
-
-       void start_fade_in_grab (ArdourCanvas::Item*, GdkEvent*);
-       void start_fade_out_grab (ArdourCanvas::Item*, GdkEvent*);
-       void fade_in_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*);
-       void fade_out_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*);
-       void fade_in_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
-       void fade_out_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
-
        void set_fade_in_shape (ARDOUR::AudioRegion::FadeShape);
        void set_fade_out_shape (ARDOUR::AudioRegion::FadeShape);
-       
+
        void set_fade_length (bool in);
        void toggle_fade_active (bool in);
        void set_fade_in_active (bool);
        void set_fade_out_active (bool);
-       
+
        std::set<boost::shared_ptr<ARDOUR::Playlist> > motion_frozen_playlists;
-       RegionSelection pre_drag_region_selection;
-       void region_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*);
-       void region_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
-       void create_region_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*);
-       void create_region_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
-       bool check_region_drag_possible (RouteTimeAxisView**, ARDOUR::layer_t*);
-       void possibly_copy_regions_during_grab (GdkEvent*);
-       void region_drag_splice_motion_callback (ArdourCanvas::Item*, GdkEvent*);
-       void region_drag_splice_finished_callback (ArdourCanvas::Item*, GdkEvent*);
 
        bool _dragging_playhead;
        bool _dragging_edit_point;
 
-       void cursor_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*);
-       void cursor_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
-       void cursor_drag_finished_ensure_locate_callback (ArdourCanvas::Item*, GdkEvent*);
-       void marker_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*);
-       void marker_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
-       void control_point_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*);
-       void control_point_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
-       void line_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*);
-       void line_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
-
-       void tempo_marker_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*);
-       void tempo_marker_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
-       void meter_marker_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*);
-       void meter_marker_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
+       void marker_drag_motion_callback (GdkEvent*);
+       void marker_drag_finished_callback (GdkEvent*);
 
        gint mouse_rename_region (ArdourCanvas::Item*, GdkEvent*);
 
-       void start_region_grab (ArdourCanvas::Item*, GdkEvent*);
+       void start_region_grab (ArdourCanvas::Item*, GdkEvent*, RegionView*);
        void start_create_region_grab (ArdourCanvas::Item*, GdkEvent*);
-       void start_region_copy_grab (ArdourCanvas::Item*, GdkEvent*);
-       void start_region_brush_grab (ArdourCanvas::Item*, GdkEvent*);
+       void start_region_copy_grab (ArdourCanvas::Item*, GdkEvent*, RegionView*);
+       void start_region_brush_grab (ArdourCanvas::Item*, GdkEvent*, RegionView*);
        void start_selection_grab (ArdourCanvas::Item*, GdkEvent*);
-       void start_cursor_grab (ArdourCanvas::Item*, GdkEvent*);
-       void start_cursor_grab_no_stop (ArdourCanvas::Item*, GdkEvent*);
-       void start_marker_grab (ArdourCanvas::Item*, GdkEvent*);
-       void start_control_point_grab (ArdourCanvas::Item*, GdkEvent*);
-       void start_line_grab_from_regionview (ArdourCanvas::Item*, GdkEvent*);
-       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*);
 
@@ -1518,7 +1320,7 @@ class Editor : public PublicEditor
        bool canvas_fade_in_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*);
        bool canvas_fade_out_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*);
        bool canvas_fade_out_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*);
-       
+
 
        // These variables are used to detect a feedback loop and break it to avoid a gui hang
 private:
@@ -1527,6 +1329,7 @@ private:
 public:
 
        bool canvas_region_view_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
+       bool canvas_frame_handle_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
        bool canvas_region_view_name_highlight_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
        bool canvas_region_view_name_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
        bool canvas_stream_view_event (GdkEvent* event,ArdourCanvas::Item*, RouteTimeAxisView*);
@@ -1535,6 +1338,7 @@ public:
        bool canvas_tempo_marker_event (GdkEvent* event,ArdourCanvas::Item*, TempoMarker*);
        bool canvas_meter_marker_event (GdkEvent* event,ArdourCanvas::Item*, MeterMarker*);
        bool canvas_automation_track_event(GdkEvent* event, ArdourCanvas::Item*, AutomationTimeAxisView*) ;
+       bool canvas_note_event (GdkEvent* event, ArdourCanvas::Item*);
 
        bool canvas_tempo_bar_event (GdkEvent* event, ArdourCanvas::Item*);
        bool canvas_meter_bar_event (GdkEvent* event, ArdourCanvas::Item*);
@@ -1565,6 +1369,7 @@ public:
        Gtk::Allocation canvas_allocation;
        void track_canvas_allocate (Gtk::Allocation alloc);
        bool track_canvas_size_allocated ();
+       bool track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const &, int, int, guint);
 
        void set_playhead_cursor ();
 
@@ -1579,17 +1384,15 @@ public:
        void initialize_canvas ();
 
        /* display control */
-       
+
        bool _show_measures;
-       /// true to show waveforms, otherwise false
-       bool _show_waveforms;
        /// true if the editor should follow the playhead, otherwise false
        bool _follow_playhead;
        /// true if waveforms should be shown while recording audio tracks, otherwise false
        bool _show_waveforms_recording;
-       
+
        ARDOUR::TempoMap::BBTPointList *current_bbt_points;
-       
+
        TempoLines* tempo_lines;
 
        ArdourCanvas::Group* time_line_group;
@@ -1607,13 +1410,13 @@ public:
        void remove_meter_marker (ArdourCanvas::Item*);
        gint real_remove_tempo_marker (ARDOUR::TempoSection*);
        gint real_remove_meter_marker (ARDOUR::MeterSection*);
-       
+
        void edit_tempo_section (ARDOUR::TempoSection*);
        void edit_meter_section (ARDOUR::MeterSection*);
        void edit_tempo_marker (ArdourCanvas::Item*);
        void edit_meter_marker (ArdourCanvas::Item*);
        void edit_control_point (ArdourCanvas::Item*);
-       
+
        void marker_menu_edit ();
        void marker_menu_remove ();
        void marker_menu_rename ();
@@ -1652,7 +1455,7 @@ public:
        Gtk::Menu* cd_marker_menu;
        ArdourCanvas::Item* marker_menu_item;
 
-       typedef list<Marker*> Marks;
+       typedef std::list<Marker*> Marks;
        Marks metric_marks;
 
        void remove_metric_marks ();
@@ -1661,10 +1464,10 @@ public:
        void compute_current_bbt_points (nframes_t left, nframes_t right);
        void tempo_map_changed (ARDOUR::Change);
        void redisplay_tempo (bool immediate_redraw);
-       
+
        void snap_to (nframes64_t& first, int32_t direction = 0, bool for_mark = false);
-       
-       double snap_length_beats (nframes64_t start);
+       void snap_to_with_modifier (nframes64_t& first, GdkEvent const *, int32_t direction = 0, bool for_mark = false);
+       void snap_to (nframes64_t& first, nframes64_t& last, int32_t direction = 0, bool for_mark = false);
 
        uint32_t bbt_beat_subdivision;
 
@@ -1675,31 +1478,35 @@ public:
        void editor_mixer_button_toggled ();
        void editor_list_button_toggled ();
 
-       AudioClock               edit_point_clock;
        AudioClock               zoom_range_clock;
        Gtk::Button              zoom_in_button;
        Gtk::Button              zoom_out_button;
        Gtk::Button              zoom_out_full_button;
        Gtk::Button              zoom_onetoone_button;
 
+       Gtk::Button              tav_expand_button;
+       Gtk::Button              tav_shrink_button;
+
        Gtk::VBox                toolbar_clock_vbox;
-       Gtk::VBox                toolbar_selection_clock_vbox; 
+       Gtk::VBox                toolbar_selection_clock_vbox;
        Gtk::Table               toolbar_selection_clock_table;
        Gtk::Label               toolbar_selection_cursor_label;
-       
+
        Gtk::HBox                mouse_mode_button_box;
        Gtkmm2ext::TearOff*      mouse_mode_tearoff;
-       Gtk::ToggleButton        mouse_select_button;
-       Gtk::ToggleButton        mouse_move_button;
-       Gtk::ToggleButton        mouse_gain_button;
-       Gtk::ToggleButton        mouse_zoom_button;
-       Gtk::ToggleButton        mouse_timefx_button;
-       Gtk::ToggleButton        mouse_audition_button;
-       Gtk::ToggleButton        mouse_note_button;
-       GroupedButtons          *mouse_mode_button_set;
+       Gtk::ToggleButton         mouse_select_button;
+       Gtk::ToggleButton         mouse_move_button;
+       Gtk::ToggleButton         mouse_gain_button;
+       Gtk::ToggleButton         mouse_zoom_button;
+       Gtk::ToggleButton         mouse_timefx_button;
+       Gtk::ToggleButton         mouse_audition_button;
+
        void                     mouse_mode_toggled (Editing::MouseMode m);
        bool                     ignore_mouse_mode_toggle;
 
+       Gtk::ToggleButton        internal_edit_button;
+       void                     toggle_internal_editing ();
+
        gint                     mouse_select_button_release (GdkEventButton*);
 
        Gtk::VBox                automation_box;
@@ -1732,18 +1539,18 @@ public:
        Gtk::VBox         zoom_focus_box;
 
        std::vector<std::string> zoom_focus_strings;
-       
+
        void zoom_focus_selection_done ();
        void zoom_focus_chosen (Editing::ZoomFocus);
 
        Glib::RefPtr<Gtk::RadioAction> zoom_focus_action (Editing::ZoomFocus);
 
        Gtk::HBox           zoom_box;
+       Gtk::HBox           track_zoom_box;
+       Gtk::VBox           zoom_vbox;
 
        void                zoom_adjustment_changed();
 
-       void                edit_point_clock_changed();
-       
        void setup_toolbar ();
 
        Gtkmm2ext::TearOff*      tools_tearoff;
@@ -1753,25 +1560,12 @@ public:
 
        /* midi toolbar */
 
-       Gtk::HBox                midi_tool_button_box;
-       Gtk::ToggleButton        midi_tool_pencil_button;
-       Gtk::ToggleButton        midi_tool_select_button;
-       Gtk::ToggleButton        midi_tool_resize_button;
-       Gtk::ToggleButton        midi_tool_erase_button;
+       Gtk::HBox                panic_box;
        Gtk::Button              midi_panic_button;
        Gtk::ToggleButton        midi_sound_notes;
-       GroupedButtons          *midi_tool_button_set;
-       void                     midi_edit_mode_toggled (Editing::MidiEditMode m);
-       void                     midi_panic_button_pressed ();
+       void                     midi_panic ();
        bool                     sound_notes () const { return midi_sound_notes.get_active(); }
-       
-       bool                     ignore_midi_edit_mode_toggle;
-
-       Gtkmm2ext::TearOff* midi_tools_tearoff;
-       Gtk::HBox           midi_toolbar_hbox;
-       Gtk::EventBox       midi_toolbar_base;
-       Gtk::Frame          midi_toolbar_frame;
-       
+
        void setup_midi_toolbar ();
 
        /* selection process */
@@ -1787,16 +1581,6 @@ public:
        void point_selection_changed ();
        void marker_selection_changed ();
 
-       enum SelectionOp {
-               CreateSelection,
-               SelectionStartTrim,
-               SelectionEndTrim,
-               SelectionMove
-       } selection_op;
-
-       void start_selection_op (ArdourCanvas::Item* item, GdkEvent* event, SelectionOp);
-       void drag_selection (ArdourCanvas::Item* item, GdkEvent* event);
-       void end_selection_op (ArdourCanvas::Item* item, GdkEvent* event);
        void cancel_selection ();
 
        void region_selection_op (void (ARDOUR::Region::*pmf)(void));
@@ -1806,24 +1590,11 @@ public:
        bool audio_region_selection_covers (nframes64_t where);
 
        /* transport range select process */
-       enum RangeMarkerOp {
-               CreateRangeMarker,
-               CreateTransportMarker,
-               CreateCDMarker
-       } range_marker_op;
-
-       void start_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event, RangeMarkerOp);
-       void drag_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event);
-       void end_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event);
 
        ArdourCanvas::SimpleRect*  cd_marker_bar_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 *);
 #ifdef GTKOSX
        ArdourCanvas::SimpleRect     *bogus_background_rect;
 #endif
@@ -1841,127 +1612,31 @@ public:
        ARDOUR::Location*  transport_punch_location();
 
        ARDOUR::Location   *temp_location;
-       
+
        /* object rubberband select process */
-       
-       void start_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event);
-       void drag_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event);
-       void end_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event);
 
        bool select_all_within (nframes64_t start, nframes64_t end, gdouble topy, gdouble boty, const TrackViewList&, Selection::Operation op);
-       
+
        ArdourCanvas::SimpleRect   *rubberband_rect;
-       
-       /* mouse zoom process */
 
-       void start_mouse_zoom (ArdourCanvas::Item* item, GdkEvent* event);
-       void drag_mouse_zoom (ArdourCanvas::Item* item, GdkEvent* event);
-       void end_mouse_zoom (ArdourCanvas::Item* item, GdkEvent* event);
+       /* mouse zoom process */
 
        ArdourCanvas::SimpleRect   *zoom_rect;
        void reposition_zoom_rect (nframes64_t start, nframes64_t end);
-       
-       /* diskstream/route display management */
 
-       struct RouteDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
-           RouteDisplayModelColumns() { 
-                   add (text);
-                   add (visible);
-                   add (temporary_visible);
-                   add (tv);
-                   add (route);
-           }
-           Gtk::TreeModelColumn<Glib::ustring>  text;
-           Gtk::TreeModelColumn<bool>           visible;
-           Gtk::TreeModelColumn<bool>           temporary_visible;
-           Gtk::TreeModelColumn<TimeAxisView*>  tv;
-           Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> >  route;
-       };
+       EditorRouteGroups* _route_groups;
+       EditorRoutes* _routes;
+       EditorRegions* _regions;
+       EditorSnapshots* _snapshots;
+       EditorLocations* _locations;
 
-       RouteDisplayModelColumns         route_display_columns;
-       Glib::RefPtr<Gtk::ListStore>     route_display_model;
-       Glib::RefPtr<Gtk::TreeSelection> route_display_selection;
+       /* diskstream/route display management */
+       Glib::RefPtr<Gdk::Pixbuf> rec_enabled_icon;
+       Glib::RefPtr<Gdk::Pixbuf> rec_disabled_icon;
 
-       Gtkmm2ext::DnDTreeView<boost::shared_ptr<ARDOUR::Route> > route_list_display; 
-       Gtk::ScrolledWindow                   route_list_scroller;
-       Gtk::Menu*                            route_list_menu;
-
-       void update_route_visibility ();
-
-       void sync_order_keys (const char*);
-       bool route_redisplay_does_not_sync_order_keys;
-       bool route_redisplay_does_not_reset_order_keys;
-
-       bool route_list_display_button_press (GdkEventButton*);
-       void route_list_display_drag_data_received  (const Glib::RefPtr<Gdk::DragContext>& context,
-                                                    gint                x,
-                                                    gint                y,
-                                                    const Gtk::SelectionData& data,
-                                                    guint               info,
-                                                    guint               time);
-
-       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 track_list_reorder (const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter, int* new_order);
-
-       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 build_route_list_menu ();
-       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;
-       };
+       Glib::RefPtr<Gtk::TreeSelection> route_display_selection;
 
-       GroupListModelColumns group_columns;
-       Glib::RefPtr<Gtk::ListStore> group_model;
-       Glib::RefPtr<Gtk::TreeSelection> group_selection;
-
-       Gtk::TreeView          edit_group_display;
-       Gtk::ScrolledWindow    edit_group_display_scroller;
-       Gtk::Menu*             edit_group_list_menu;
-
-       void build_edit_group_list_menu ();
-       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 add_edit_group (ARDOUR::RouteGroup* group);
-       void remove_selected_edit_group ();
-       void edit_groups_changed ();
-       void group_flags_changed (void*, ARDOUR::RouteGroup*);
+       bool sync_track_view_list_and_routes ();
 
        Gtk::VBox           list_vpacker;
 
@@ -1981,25 +1656,15 @@ public:
        bool autoscroll_canvas ();
        void start_canvas_autoscroll (int x, int y);
        void stop_canvas_autoscroll ();
-       void maybe_autoscroll (GdkEventMotion*);
-       void maybe_autoscroll_horizontally (GdkEventMotion*);
+       void maybe_autoscroll (GdkEventMotion*, bool);
        bool allow_vertical_scroll;
 
        /* trimming */
-       enum TrimOp {
-               StartTrim,
-               EndTrim,
-               ContentsTrim,
-       } trim_op;
-
-       void start_trim (ArdourCanvas::Item*, GdkEvent*);
        void point_trim (GdkEvent*);
-       void trim_motion_callback (ArdourCanvas::Item*, GdkEvent*);
        void single_contents_trim (RegionView&, nframes64_t, bool, bool, bool);
-       void single_start_trim (RegionView&, nframes64_t, bool, bool);
-       void single_end_trim (RegionView&, nframes64_t, bool, bool);
+       void single_start_trim (RegionView&, nframes64_t, bool, bool, bool);
+       void single_end_trim (RegionView&, nframes64_t, bool, bool, bool);
 
-       void trim_finished_callback (ArdourCanvas::Item*, GdkEvent*);
        void thaw_region_after_trim (RegionView& rv);
 
        void trim_region_front();
@@ -2012,77 +1677,75 @@ public:
        void trim_region_to_punch ();
        void trim_region_to_location (const ARDOUR::Location&, const char* cmd);
 
+       void trim_to_region(bool forward);
+       void trim_region_to_previous_region_end();
+       void trim_region_to_next_region_start();
+
        bool show_gain_after_trim;
 
        /* Drag-n-Drop */
 
-       int convert_drop_to_paths (std::vector<Glib::ustring>& paths,
-                                  const Glib::RefPtr<Gdk::DragContext>& context,
-                                  gint                x,
-                                  gint                y,
-                                  const Gtk::SelectionData& data,
-                                  guint               info,
-                                  guint               time);
-
-       void  track_canvas_drag_data_received  (const Glib::RefPtr<Gdk::DragContext>& context,
-                                               gint                x,
-                                               gint                y,
-                                               const Gtk::SelectionData& data,
-                                               guint               info,
-                                               guint               time);
-       
-       void  region_list_display_drag_data_received  (const Glib::RefPtr<Gdk::DragContext>& context,
-                                                      gint                x,
-                                                      gint                y,
-                                                      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);
-
-       void  drop_routes (const Glib::RefPtr<Gdk::DragContext>& context,
-                          gint                x,
-                          gint                y,
-                          const Gtk::SelectionData& data,
-                          guint               info,
-                          guint               time);
+       int convert_drop_to_paths (
+                       std::vector<Glib::ustring>&           paths,
+                       const Glib::RefPtr<Gdk::DragContext>& context,
+                       gint                                  x,
+                       gint                                  y,
+                       const Gtk::SelectionData&             data,
+                       guint                                 info,
+                       guint                                 time);
+
+       void track_canvas_drag_data_received (
+                       const Glib::RefPtr<Gdk::DragContext>& context,
+                       gint                                  x,
+                       gint                                  y,
+                       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);
+
+       void drop_routes (
+                       const Glib::RefPtr<Gdk::DragContext>& context,
+                       gint                x,
+                       gint                y,
+                       const Gtk::SelectionData& data,
+                       guint               info,
+                       guint               time);
 
        /* audio export */
 
        int  write_region_selection(RegionSelection&);
-       bool write_region (string path, boost::shared_ptr<ARDOUR::AudioRegion>);
+       bool write_region (std::string path, boost::shared_ptr<ARDOUR::AudioRegion>);
        void bounce_region_selection ();
-       void bounce_range_selection (bool replace);
+       void bounce_range_selection (bool replace, bool enable_processing);
        void external_edit_region ();
 
        int write_audio_selection (TimeSelection&);
-       bool write_audio_range (ARDOUR::AudioPlaylist&, const ARDOUR::ChanCount& channels, list<ARDOUR::AudioRange>&);
+       bool write_audio_range (ARDOUR::AudioPlaylist&, const ARDOUR::ChanCount& channels, std::list<ARDOUR::AudioRange>&);
 
        void write_selection ();
 
-       /* history */
-
-       UndoAction get_memento() const;
-
        XMLNode *before; /* used in *_reversible_command */
 
-       void begin_reversible_command (string cmd_name);
+       void begin_reversible_command (std::string cmd_name);
        void commit_reversible_command ();
 
-       void update_title ();   
-       void update_title_s (const string & snapshot_name);
+       void update_title ();
+       void update_title_s (const std::string & snapshot_name);
 
        struct State {
            Selection* selection;
@@ -2092,13 +1755,10 @@ public:
            ~State ();
        };
 
-       void store_state (State&) const;
-       void restore_state (State *);
-
        void instant_save ();
 
        boost::shared_ptr<ARDOUR::AudioRegion> last_audition_region;
-       
+
        /* freeze operations */
 
        ARDOUR::InterThreadInfo freeze_status;
@@ -2109,68 +1769,23 @@ public:
        void freeze_route ();
        void unfreeze_route ();
 
-       /* edit-group solo + mute */
+       /* route-group solo + mute */
 
-       void set_edit_group_solo (ARDOUR::Route&, bool);
-       void set_edit_group_mute (ARDOUR::Route&, bool);
+       void set_route_group_solo (ARDOUR::Route&, bool);
+       void set_route_group_mute (ARDOUR::Route&, bool);
 
        /* duplication */
 
        void duplicate_dialog (bool with_dialog);
-       
-       nframes64_t event_frame (GdkEvent*, double* px = 0, double* py = 0) const;
+
+       nframes64_t event_frame (GdkEvent const *, double* px = 0, double* py = 0) const;
 
        /* returns false if mouse pointer is not in track or marker canvas
         */
        bool mouse_frame (nframes64_t&, bool& in_track_canvas) const;
 
-       void time_fx_motion (ArdourCanvas::Item*, GdkEvent*);
-       void start_time_fx (ArdourCanvas::Item*, GdkEvent*);
-       void end_time_fx (ArdourCanvas::Item*, GdkEvent*);
-
-       struct TimeFXDialog : public ArdourDialog {
-           ARDOUR::TimeFXRequest request;
-           Editor&               editor;
-           bool                  pitching;
-           Gtk::Adjustment       pitch_octave_adjustment;
-           Gtk::Adjustment       pitch_semitone_adjustment;
-           Gtk::Adjustment       pitch_cent_adjustment;
-           Gtk::SpinButton       pitch_octave_spinner;
-           Gtk::SpinButton       pitch_semitone_spinner;
-           Gtk::SpinButton       pitch_cent_spinner;
-           RegionSelection       regions;
-           Gtk::ProgressBar      progress_bar;
-
-           /* SoundTouch */
-           Gtk::ToggleButton     quick_button;
-           Gtk::ToggleButton     antialias_button;
-           Gtk::HBox             upper_button_box;
-
-           /* RubberBand */
-           Gtk::ComboBoxText     stretch_opts_selector;
-           Gtk::Label            stretch_opts_label;
-           Gtk::ToggleButton     precise_button;
-           Gtk::ToggleButton     preserve_formants_button;
-           Gtk::HBox             opts_box;
-
-           Gtk::Button*          cancel_button;
-           Gtk::Button*          action_button;
-           Gtk::VBox             packer;
-           int                   status;
-
-           TimeFXDialog (Editor& e, bool for_pitch);
-
-           gint update_progress ();
-           sigc::connection first_cancel;
-           sigc::connection first_delete;
-           void cancel_in_progress ();
-           gint delete_in_progress (GdkEventAny*);
-       };
-
        /* "whats mine is yours" */
 
-       friend class TimeFXDialog;
-
        TimeFXDialog* current_timefx;
 
        static void* timefx_thread (void *arg);
@@ -2187,9 +1802,7 @@ public:
        bool show_editor_mixer_when_tracks_arrive;
        Gtk::VBox current_mixer_strip_vbox;
        void cms_new (boost::shared_ptr<ARDOUR::Route>);
-       void cms_deleted ();
        void current_mixer_strip_hidden ();
-       void current_mixer_strip_removed ();
 
        void detach_tearoff (Gtk::Box* b, Gtk::Window* w);
        void reattach_tearoff (Gtk::Box* b, Gtk::Window* w, int32_t n);
@@ -2203,10 +1816,10 @@ public:
        /* xfades */
 
        bool _xfade_visibility;
-       
+
 #ifdef WITH_CMT
-       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 handle_new_imageframe_time_axis_view(const std::string & track_name, void* src) ;
+       void handle_new_imageframe_marker_time_axis_view(const std::string & track_name, TimeAxisView* marked_track) ;
 
        void start_imageframe_grab(ArdourCanvas::Item*, GdkEvent*) ;
        void start_markerview_grab(ArdourCanvas::Item*, GdkEvent*) ;
@@ -2231,7 +1844,7 @@ public:
        void imageframe_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* event) ;
        void imageframe_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event) ;
        void imageframe_end_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* event) ;
-       
+
        void markerview_item_start_handle_op(ArdourCanvas::Item* item, GdkEvent* event) ;
        void markerview_item_end_handle_op(ArdourCanvas::Item* item, GdkEvent* event) ;
        void markerview_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event) ;
@@ -2262,20 +1875,21 @@ public:
        Gtk::VBox        nudge_vbox;
        AudioClock       nudge_clock;
 
-       nframes64_t get_nudge_distance (nframes64_t pos, nframes64_t& next);
-
        bool nudge_forward_release (GdkEventButton*);
        bool nudge_backward_release (GdkEventButton*);
-       
+
        /* audio filters */
 
-       void apply_filter (ARDOUR::Filter&, string cmd);
+       void apply_filter (ARDOUR::Filter&, std::string cmd);
+
+       Command* apply_midi_note_edit_op_to_region (ARDOUR::MidiOperator& op, MidiRegionView& mrv);
+       void apply_midi_note_edit_op (ARDOUR::MidiOperator& op);
 
        /* handling cleanup */
 
        int playlist_deletion_dialog (boost::shared_ptr<ARDOUR::Playlist>);
 
-       vector<sigc::connection> session_connections;
+       PBD::ScopedConnectionList session_connections;
 
        /* tracking step changes of track height */
 
@@ -2307,7 +1921,7 @@ public:
        bool on_key_press_event (GdkEventKey*);
        bool on_key_release_event (GdkEventKey*);
 
-       void session_state_saved (string);
+       void session_state_saved (std::string);
 
        Glib::RefPtr<Gtk::Action>              undo_action;
        Glib::RefPtr<Gtk::Action>              redo_action;
@@ -2329,15 +1943,13 @@ public:
        std::vector<std::string> edit_point_strings;
 
        void selected_marker_moved (ARDOUR::Location*);
-       sigc::connection edit_point_clock_connection_a;
-       sigc::connection edit_point_clock_connection_b;
 
        bool get_edit_op_range (nframes64_t& start, nframes64_t& end) const;
 
-       void get_regions_at (RegionSelection&, nframes64_t where, const TrackSelection& ts) const;
-       void get_regions_after (RegionSelection&, nframes64_t where, const TrackSelection& ts) const;
-       
-       void get_regions_for_action (RegionSelection&, bool allowed_entered_regionview = false);
+       void get_regions_at (RegionSelection&, nframes64_t where, const TrackViewList& ts) const;
+       void get_regions_after (RegionSelection&, nframes64_t where, const TrackViewList& ts) const;
+
+       void get_regions_for_action (RegionSelection&, bool allow_entered = false, bool allow_edit_position = true);
 
        sigc::connection fast_screen_update_connection;
        gint start_updating ();
@@ -2349,36 +1961,74 @@ public:
        void select_prev_route ();
 
        void snap_to_internal (nframes64_t& first, int32_t direction = 0, bool for_mark = false);
+       void timecode_snap_to_internal (nframes64_t& first, int32_t direction = 0, bool for_mark = false);
 
        RhythmFerret* rhythm_ferret;
        BundleManager* _bundle_manager;
        GlobalPortMatrixWindow* _global_port_matrix[ARDOUR::DataType::num_types];
 
-       void fit_tracks ();
+       void fit_tracks (TrackViewList &);
+       void fit_selected_tracks ();
        void set_track_height (uint32_t h);
-       void set_track_height_largest ();
-       void set_track_height_large ();
-       void set_track_height_larger ();
-       void set_track_height_normal ();
-       void set_track_height_smaller ();
-       void set_track_height_small ();
 
        void remove_tracks ();
        void toggle_tracks_active ();
-       void waveform_scale_chosen (Editing::WaveformScale);
 
        bool _have_idled;
        int resize_idle_id;
-       int32_t resize_idle_target;
        bool idle_resize();
        friend gboolean _idle_resize (gpointer);
-       std::vector<TimeAxisView*> pending_resizes;
+       int32_t _pending_resize_amount;
+       TimeAxisView* _pending_resize_view;
 
        void visible_order_range (int*, int*) const;
-       bool y_movement_disallowed (int, int, int, int, int, std::bitset<512> const &, std::vector<int32_t> const &) const;
 
        void located ();
        bool _pending_locate_request;
+
+       Gtk::HBox _summary_hbox;
+       EditorSummary* _summary;
+       void region_view_added (RegionView *);
+
+       void update_canvas_now ();
+       void streamview_height_changed ();
+
+       EditorGroupTabs* _group_tabs;
+       void fit_route_group (ARDOUR::RouteGroup *);
+
+       void start_step_editing ();
+       void stop_step_editing ();
+       bool check_step_edit ();
+       sigc::connection step_edit_connection;
+
+       friend class Drag;
+       friend class RegionDrag;
+       friend class RegionMoveDrag;
+       friend class RegionSpliceDrag;
+       friend class TrimDrag;
+       friend class MeterMarkerDrag;
+       friend class TempoMarkerDrag;
+       friend class CursorDrag;
+       friend class FadeInDrag;
+       friend class FadeOutDrag;
+       friend class MarkerDrag;
+       friend class RegionGainDrag;
+       friend class ControlPointDrag;
+       friend class LineDrag;
+       friend class RubberbandSelectDrag;
+        friend class TimeFXDrag;
+        friend class ScrubDrag;
+       friend class SelectionDrag;
+       friend class RangeMarkerBarDrag;
+       friend class MouseZoomDrag;
+       friend class RegionCreateDrag;
+       friend class RegionMotionDrag;
+       friend class RegionInsertDrag;
+
+       friend class EditorSummary;
+       friend class EditorGroupTabs;
+
+       friend class EditorRoutes;
 };
 
 #endif /* __ardour_editor_h__ */