Add a widget giving an overview of the editor, as (what I think is being) suggested...
[ardour.git] / gtk2_ardour / editor.h
index e8af889ad12de63e8719a9685846baa4e21471bd..4d212d581cca06ee9559f9af0e70b6049f5716e0 100644 (file)
@@ -25,6 +25,7 @@
 #include <set>
 #include <string>
 #include <sys/time.h>
+#include <bitset>
 
 #include <glibmm/ustring.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 "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 "audio_clock.h"
 #include "gtk-custom-ruler.h"
@@ -61,9 +63,7 @@
 #include "editor_items.h"
 #include "region_selection.h"
 #include "canvas.h"
-#include "time_axis_view.h"
-#include "draginfo.h"
-#include "tempo_lines.h"
+#include "editor_summary.h"
 
 namespace Gtkmm2ext {
        class TearOff;
@@ -88,31 +88,32 @@ 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 UIExportSpecification;
-class ExportDialog;
+class Marker;
+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;
-#ifdef FFT_ANALYSIS
-class AnalysisWindow;
-#endif
 
 /* <CMT Additions> */
 class ImageFrameView;
@@ -124,17 +125,31 @@ class ImageFrameSocketHandler ;
 class TimeAxisViewItem ;
 /* </CMT Additions> */
 
+struct EditorCursor {
+       Editor&               editor;
+       ArdourCanvas::Points  points;
+       ArdourCanvas::Line    canvas_item;
+       nframes64_t           current_frame;
+       double            length;
+       
+       EditorCursor (Editor&, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*));
+       ~EditorCursor ();
+       
+       void set_position (nframes64_t);
+       void set_length (double units);
+       void set_y_axis (double position);
+};
 
 class Editor : public PublicEditor
 {
   public:
        Editor ();
        ~Editor ();
-
+       
        void             connect_to_session (ARDOUR::Session *);
        ARDOUR::Session* current_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 {
@@ -184,11 +199,6 @@ 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; }
        
@@ -240,7 +250,7 @@ class Editor : public PublicEditor
        }
 
        gulong frame_to_pixel (nframes64_t frame) const {
-               return (gulong) rint ((frame / (frames_per_unit *  GNOME_CANVAS(track_canvas->gobj())->pixels_per_unit)));
+               return (gulong) rint ((frame / (frames_per_unit * GNOME_CANVAS(track_canvas->gobj())->pixels_per_unit)));
        }
 
        void flush_canvas ();
@@ -263,28 +273,25 @@ class Editor : public PublicEditor
 
        void set_show_measures (bool yn);
        bool show_measures () const { return _show_measures; }
-       bool initial_ruler_update_required;
 
-#ifdef FFT_ANALYSIS
        /* analysis window */
+
        void analyze_region_selection();
        void analyze_range_selection();
-#endif
 
        /* export */
-
-       /* these initiate export ... */
        
-       void export_session();
-       void export_selection();
-
+       void export_audio ();
+       void export_selection ();
+       void export_range ();
+       void export_region ();
 
        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);
 
@@ -299,10 +306,12 @@ class Editor : public PublicEditor
        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&);
        void show_editor_mixer (bool yn);
+       void create_editor_mixer ();
        void show_editor_list (bool yn);
        void set_selected_mixer_strip (TimeAxisView&);
        void hide_track_in_display (TimeAxisView& tv, bool temporary = false);
@@ -325,36 +334,21 @@ class Editor : public PublicEditor
        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 toggle_measure_visibility ();
        void toggle_logo_visibility ();
 
-       /* 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);
+       double get_physical_screen_width () const { return physical_screen_width; };
+       double physical_screen_width;
+       double physical_screen_height;
 
-       void update_smpte_mode();
-       void update_video_pullup();
-       void update_subframes_per_frame ();
-       /* xfades */
+       /* fades/xfades */
 
-       void toggle_auto_xfade ();
-       void toggle_xfades_active ();
-       void toggle_xfade_visibility ();
+       void toggle_selected_region_fades (int dir);
+       void update_region_fade_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 ();
 
        /* redirect shared ops menu. caller must free returned menu */
 
@@ -369,6 +363,8 @@ 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 ();
@@ -388,6 +384,8 @@ 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);
@@ -494,7 +492,7 @@ class Editor : public PublicEditor
 
            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);
        };
@@ -509,16 +507,16 @@ 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;
@@ -533,9 +531,9 @@ class Editor : public PublicEditor
 
        /* 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);
-       void mapped_use_copy_playlist (RouteTimeAxisView&, uint32_t);
+       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 */
@@ -547,7 +545,9 @@ 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);
@@ -583,7 +583,7 @@ class Editor : public PublicEditor
 
        void add_item_with_sensitivity (Gtk::Menu_Helpers::MenuList&, Gtk::Menu_Helpers::MenuElem, bool) const;
 
-       void handle_new_route (ARDOUR::Session::RouteList&);
+       void handle_new_route (ARDOUR::RouteList&);
        void remove_route (TimeAxisView *);
        bool route_removal;
 
@@ -600,27 +600,25 @@ class Editor : public PublicEditor
        Gdk::Cursor* which_grabber_cursor ();
 
        ArdourCanvas::Canvas* track_canvas;
-       ArdourCanvas::Canvas* time_canvas;
 
-       ArdourCanvas::Text* first_action_message;
        ArdourCanvas::Text* 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::Frame         time_button_frame;
+       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;
@@ -633,6 +631,32 @@ class Editor : public PublicEditor
        ArdourCanvas::Group      *range_marker_group;
        ArdourCanvas::Group      *transport_marker_group;
        ArdourCanvas::Group*      cd_marker_group;
+
+       ArdourCanvas::Group*      timebar_group;
+
+       /* These bars never need to be scrolled */
+       ArdourCanvas::Group*      meter_bar_group;
+       ArdourCanvas::Group*      tempo_bar_group;
+       ArdourCanvas::Group*      marker_bar_group;
+       ArdourCanvas::Group*      range_marker_bar_group;
+       ArdourCanvas::Group*      transport_marker_bar_group;
+       ArdourCanvas::Group*      cd_marker_bar_group;
+
+       /** 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. 
+       */
+       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,
@@ -659,14 +683,14 @@ 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;
+       gint          ruler_pressed_button;
        Gtk::Widget * ruler_grabbed_widget;
        
        void initialize_rulers ();
@@ -755,6 +779,8 @@ class Editor : public PublicEditor
 
        static const double timebar_height;
        guint32 visible_timebars;
+       gdouble canvas_timebars_vsize;
+       gdouble get_canvas_timebars_vsize () const { return canvas_timebars_vsize; }
        Gtk::Menu          *editor_ruler_menu;
        
        ArdourCanvas::SimpleRect* tempo_bar;
@@ -774,52 +800,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 ();
-
-           void set_position (nframes64_t);
-           void set_length (double units);
-           void set_y_axis (double position);
-       };
+       friend class EditorCursor;
+       
+       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 ();
@@ -827,7 +837,7 @@ 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;
@@ -842,6 +852,7 @@ class Editor : public PublicEditor
        Gtk::Layout         controls_layout;
        bool control_layout_scroll (GdkEventScroll* ev);
        void controls_layout_size_request (Gtk::Requisition*);
+       sigc::connection controls_layout_size_request_connection;
 
        Gtk::HScrollbar     edit_hscrollbar;
        bool                _dragging_hscrollbar;
@@ -855,15 +866,14 @@ class Editor : public PublicEditor
        double canvas_width;
        double canvas_height;
        double full_canvas_height;
-       nframes64_t last_canvas_frame;
 
        bool track_canvas_map_handler (GdkEventAny*);
-       bool time_canvas_map_handler (GdkEventAny*);
 
        gint edit_controls_button_release (GdkEventButton*);
        Gtk::Menu *edit_controls_left_menu;
        Gtk::Menu *edit_controls_right_menu;
 
+       Gtk::VBox           ruler_label_vbox;
        Gtk::VBox           track_canvas_vbox;
        Gtk::VBox           time_canvas_vbox;
        Gtk::VBox           edit_controls_vbox;
@@ -874,9 +884,14 @@ class Editor : public PublicEditor
        bool deferred_control_scroll (nframes64_t);
        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 canvas_horizontally_scrolled ();
-       void canvas_scroll_to (nframes64_t);
+       void scroll_canvas_horizontally ();
+       void scroll_canvas_vertically ();
 
        struct VisualChange {
            enum Type { 
@@ -906,13 +921,37 @@ class Editor : public PublicEditor
 
        struct RegionListDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
            RegionListDisplayModelColumns() {
-                   add (name);
+                       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;
@@ -924,6 +963,9 @@ class Editor : public PublicEditor
 
        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);
@@ -1007,7 +1049,7 @@ class Editor : public PublicEditor
 
        /* track views */
        TrackViewList  track_views;
-       TimeAxisView     *trackview_by_y_position (double ypos);
+       std::pair<TimeAxisView*, ARDOUR::layer_t> trackview_by_y_position (double);
 
        static Gdk::Cursor* cross_hair_cursor;
        static Gdk::Cursor* trimmer_cursor;
@@ -1043,7 +1085,7 @@ class Editor : public PublicEditor
        bool typed_event (ArdourCanvas::Item*, GdkEvent*, ItemType);
        bool button_press_handler (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);
        
@@ -1054,16 +1096,21 @@ class Editor : public PublicEditor
        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_new_regions (std::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;
+       std::list<boost::shared_ptr<ARDOUR::Region> > tmp_region_list;
 
        void cut_copy (Editing::CutCopyOp);
        bool can_cut_copy () const;
@@ -1080,6 +1127,7 @@ class Editor : public PublicEditor
        void toggle_region_mute ();
        void toggle_region_lock ();
        void toggle_region_opaque ();
+       void toggle_record_enable ();
        void set_region_lock_style (ARDOUR::Region::PositionLockStyle);
        void raise_region ();
        void raise_region_to_top ();
@@ -1112,13 +1160,14 @@ 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 ();
        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);
 
@@ -1166,7 +1215,7 @@ class Editor : public PublicEditor
        bool zoomed_to_region;
        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);
@@ -1181,28 +1230,27 @@ class Editor : public PublicEditor
        
        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);
 
-       void _do_import (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&);
-       void do_import (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&);
-       bool idle_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&);
-       void do_embed (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode,  nframes64_t&);
-       bool idle_do_embed (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode,  nframes64_t&);
+       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 (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&);
 
-       int  import_sndfiles (vector<Glib::ustring> paths, Editing::ImportMode mode,  ARDOUR::SrcQuality, nframes64_t& pos,
-                             int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&, bool);
-       int  embed_sndfiles (vector<Glib::ustring> paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, 
+       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 (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);
@@ -1223,21 +1271,29 @@ class Editor : public PublicEditor
        void build_interthread_progress_window ();
        ARDOUR::InterThreadInfo* current_interthread_info;
 
-#ifdef FFT_ANALYSIS
        AnalysisWindow* analysis_window;
-#endif
 
        /* import specific info */
 
-       ARDOUR::Session::import_status import_status;
+       struct EditorImportStatus : public ARDOUR::Session::ImportStatus {
+           Editing::ImportMode mode;
+           nframes64_t pos;
+           int target_tracks;
+           int target_regions;
+           boost::shared_ptr<ARDOUR::Track> track;
+           bool replace;
+       };
+
+       EditorImportStatus import_status;
        gint import_progress_timeout (void *);
        static void *_import_thread (void *);
        void* import_thread ();
+       void finish_import ();
 
        /* 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 ();
@@ -1281,6 +1337,7 @@ class Editor : public PublicEditor
 
        void add_location_mark (nframes64_t where);
        void add_location_from_audio_region ();
+       void add_locations_from_audio_region ();
        void add_location_from_selection ();
        void set_loop_from_selection (bool play);
        void set_punch_from_selection ();
@@ -1302,7 +1359,6 @@ class Editor : public PublicEditor
        void start_scrolling ();
        void stop_scrolling ();
 
-       bool _scrubbing;
        double last_scrub_x;
        int scrubbing_direction;
        int scrub_reversals;
@@ -1324,29 +1380,18 @@ class Editor : public PublicEditor
        /// Snap threshold in pixels
        double snap_threshold;
 
-       void handle_gui_changes (const string &, void *);
+       void handle_gui_changes (const std::string &, void *);
+       bool ignore_gui_changes;
 
        void    hide_all_tracks (bool with_select);
 
-       DragInfo drag_info;
-       LineDragInfo current_line_drag_info;
+       Drag* _drag;
 
-       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 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);
        
@@ -1357,49 +1402,20 @@ class Editor : public PublicEditor
        
        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**);
-       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 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_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*);
 
@@ -1464,19 +1480,16 @@ public:
 
        bool canvas_playhead_cursor_event (GdkEvent* event, ArdourCanvas::Item*);
        bool track_canvas_scroll (GdkEventScroll* event);
-       bool time_canvas_scroll (GdkEventScroll* event);
 
        bool track_canvas_scroll_event (GdkEventScroll* event);
        bool track_canvas_button_press_event (GdkEventButton* event);
        bool track_canvas_button_release_event (GdkEventButton* event);
        bool track_canvas_motion_notify_event (GdkEventMotion* event);
 
-       bool time_canvas_scroll_event (GdkEventScroll* event);
-
        Gtk::Allocation canvas_allocation;
-       bool canvas_idle_queued;
        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 ();
 
@@ -1489,15 +1502,10 @@ public:
 
        void handle_new_duration ();
        void initialize_canvas ();
-       int canvas_hroizontally_scrolled_handler_id;
-       void reset_horizontally_scrolling_region (Gtk::Allocation* alloc = 0);
-       void reset_scrolling_region (Gtk::Allocation* alloc = 0);
 
        /* 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
@@ -1505,11 +1513,9 @@ public:
        
        ARDOUR::TempoMap::BBTPointList *current_bbt_points;
        
-       ArdourCanvas::Group* time_line_group;
-       ArdourCanvas::Group* marker_time_line_group;
-       
        TempoLines* tempo_lines;
-       TempoLines* marker_tempo_lines;
+
+       ArdourCanvas::Group* time_line_group;
 
        void hide_measures ();
        void draw_measures ();
@@ -1529,6 +1535,7 @@ public:
        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 ();
@@ -1545,12 +1552,11 @@ public:
        void marker_menu_set_from_playhead ();
        void marker_menu_set_from_selection ();
        void marker_menu_range_to_next ();
-       void marker_menu_export_range ();
        void new_transport_marker_menu_set_loop ();
        void new_transport_marker_menu_set_punch ();
        void update_loop_range_view (bool visibility=false);
        void update_punch_range_view (bool visibility=false);
-        gint new_transport_marker_menu_popdown (GdkEventAny*);
+        void new_transport_marker_menu_popdown ();
        void marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
        void tm_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
        void transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
@@ -1569,14 +1575,13 @@ 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 ();
        void draw_metric_marks (const ARDOUR::Metrics& metrics);
 
        void compute_current_bbt_points (nframes_t left, nframes_t right);
-       int tempo_map_change_idle_handler_id;
        void tempo_map_changed (ARDOUR::Change);
        void redisplay_tempo (bool immediate_redraw);
        
@@ -1587,10 +1592,9 @@ public:
        uint32_t bbt_beat_subdivision;
 
        /* toolbar */
-       
+
        Gtk::ToggleButton editor_mixer_button;
        Gtk::ToggleButton editor_list_button;
-
        void editor_mixer_button_toggled ();
        void editor_list_button_toggled ();
 
@@ -1673,13 +1677,17 @@ public:
        /* midi toolbar */
 
        Gtk::HBox                midi_tool_button_box;
-       Gtkmm2ext::TearOff*      midi_tool_tearoff;
        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::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 ();
+       bool                     sound_notes () const { return midi_sound_notes.get_active(); }
+       
        bool                     ignore_midi_edit_mode_toggle;
 
        Gtkmm2ext::TearOff* midi_tools_tearoff;
@@ -1697,20 +1705,11 @@ public:
        void time_selection_changed ();
        void track_selection_changed ();
        void region_selection_changed ();
+       sigc::connection editor_regions_selection_changed_connection;
        void sensitize_the_right_region_actions (bool have_selected_regions);
        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));
@@ -1720,25 +1719,14 @@ 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
        ArdourCanvas::SimpleRect     *transport_bar_range_rect;
        ArdourCanvas::SimpleRect     *transport_bar_preroll_rect;
        ArdourCanvas::SimpleRect     *transport_bar_postroll_rect;
@@ -1756,20 +1744,12 @@ public:
        
        /* 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);
-
        ArdourCanvas::SimpleRect   *zoom_rect;
        void reposition_zoom_rect (nframes64_t start, nframes64_t end);
        
@@ -1800,8 +1780,9 @@ public:
 
        void update_route_visibility ();
 
-       void sync_order_keys ();
-       bool ignore_route_order_sync;
+       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,
@@ -1822,6 +1803,7 @@ public:
        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;
+       bool sync_track_view_list_and_route_list ();
 
        void build_route_list_menu ();
        void show_route_list_menu ();
@@ -1887,7 +1869,7 @@ public:
        uint32_t autoscroll_cnt;
        nframes64_t autoscroll_x_distance;
        double autoscroll_y_distance;
-     
+
        static gint _autoscroll_canvas (void *);
        bool autoscroll_canvas ();
        void start_canvas_autoscroll (int x, int y);
@@ -1896,20 +1878,11 @@ public:
        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();
@@ -1922,85 +1895,83 @@ 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);
+       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);
+       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);
 
        /* audio export */
 
-       ExportDialog *export_dialog;
-       ExportDialog *export_range_markers_dialog;
-       
-       void export_range (nframes64_t start, nframes64_t end);
-       void export_range_markers ();
-
        int  write_region_selection(RegionSelection&);
-       bool write_region (string path, boost::shared_ptr<ARDOUR::AudioRegion>);
-       void export_region ();
+       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_s (const std::string & snapshot_name);
 
        struct State {
            Selection* selection;
@@ -2036,58 +2007,14 @@ public:
 
        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::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);
@@ -2110,7 +2037,9 @@ public:
 
        void detach_tearoff (Gtk::Box* b, Gtk::Window* w);
        void reattach_tearoff (Gtk::Box* b, Gtk::Window* w, int32_t n);
-
+#ifdef GTKOSX
+       void ensure_all_elements_drawn ();
+#endif
        /* nudging tracks */
 
        void nudge_track (bool use_edit_point, bool forwards);
@@ -2120,8 +2049,8 @@ public:
        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*) ;
@@ -2184,13 +2113,13 @@ public:
        
        /* audio filters */
 
-       void apply_filter (ARDOUR::Filter&, string cmd);
+       void apply_filter (ARDOUR::Filter&, std::string cmd);
 
        /* handling cleanup */
 
        int playlist_deletion_dialog (boost::shared_ptr<ARDOUR::Playlist>);
 
-       vector<sigc::connection> session_connections;
+       std::vector<sigc::connection> session_connections;
 
        /* tracking step changes of track height */
 
@@ -2209,6 +2138,7 @@ public:
        bool entered_track_canvas (GdkEventCrossing*);
        void set_entered_track (TimeAxisView*);
        void set_entered_regionview (RegionView*);
+       void ensure_track_visible (TimeAxisView*);
        gint left_automation_track ();
 
        bool _new_regionviews_show_envelope;
@@ -2221,7 +2151,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;
@@ -2265,19 +2195,14 @@ public:
        void 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 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;
@@ -2285,6 +2210,40 @@ public:
        bool idle_resize();
        friend gboolean _idle_resize (gpointer);
        std::vector<TimeAxisView*> pending_resizes;
+
+       void visible_order_range (int*, int*) const;
+
+       void located ();
+       bool _pending_locate_request;
+
+       EditorSummary* _summary;
+       void region_view_added (RegionView *);
+
+       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;
 };
 
 #endif /* __ardour_editor_h__ */