first part of MIDI cut/copy/paste ; fix for input/output_streams of an IOProcessor...
[ardour.git] / gtk2_ardour / editor.h
index c4f9eafa6f90a506fb96cb2722de06071468986c..758772598c2b2b2463e432c143cecadb0e028ad6 100644 (file)
@@ -38,8 +38,8 @@
 
 #include <cmath>
 
-#include <gtkmm/layout.h>
 #include <gtkmm/comboboxtext.h>
+#include <gtkmm/layout.h>
 
 #include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/click_box.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 "ardour/route_group.h"
 
 #include "audio_clock.h"
 #include "gtk-custom-ruler.h"
@@ -115,6 +115,10 @@ class TimeFXDialog;
 class TimeSelection;
 class TrackSelection;
 class EditorGroupTabs;
+class EditorRoutes;
+class EditorRouteGroups;
+class EditorRegions;
+class EditorSnapshots;
 
 /* <CMT Additions> */
 class ImageFrameView;
@@ -179,10 +183,10 @@ class Editor : public PublicEditor
        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*) ;
@@ -276,6 +280,8 @@ class Editor : public PublicEditor
        void invert_selection_in_track ();
        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 */
 
@@ -306,7 +312,6 @@ class Editor : public PublicEditor
        /* 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);
@@ -323,7 +328,6 @@ 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 */
 
@@ -373,8 +377,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 ();
@@ -401,8 +403,17 @@ class Editor : public PublicEditor
        void goto_visual_state (uint32_t);
        void save_visual_state (uint32_t);
 
-       void update_rec_display ();
+       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);
+       
   protected:
        void map_transport_state ();
        void map_position_change (nframes64_t);
@@ -411,9 +422,9 @@ class Editor : public PublicEditor
 
   private:
 
-       /// The session that we are editing, or 0
        void color_handler ();
-       ARDOUR::Session     *session;
+       
+       ARDOUR::Session     *session; ///< The session that we are editing, or 0
        bool                 constructed;
 
        // to keep track of the playhead position for control_scroll
@@ -455,8 +466,8 @@ 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;
        int  pre_maximal_pane_position;
@@ -533,13 +544,15 @@ class Editor : public PublicEditor
 
        void sort_track_selection (TrackSelection* 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_relevant_tracks (std::set<RouteTimeAxisView*>& relevant_tracks) const;
+       void get_equivalent_tracks (RouteTimeAxisView*, std::set<RouteTimeAxisView*> &, ARDOUR::RouteGroup::Property) 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*, std::vector<RegionView*>*) 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);
@@ -554,14 +567,11 @@ 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 *);
@@ -589,8 +599,6 @@ 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;
@@ -929,103 +937,6 @@ class Editor : public PublicEditor
 
        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 {
@@ -1046,8 +957,6 @@ class Editor : public PublicEditor
        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&);
@@ -1060,6 +969,10 @@ class Editor : public PublicEditor
        /* track views */
        TrackViewList track_views;
        std::pair<TimeAxisView*, ARDOUR::layer_t> trackview_by_y_position (double);
+       TimeAxisView* axis_view_from_route (ARDOUR::Route *) const;
+       TrackSelection axis_views_from_routes (std::list<ARDOUR::Route *>) const;
+
+       TrackSelection get_tracks_for_range_action () const;
 
        static Gdk::Cursor* cross_hair_cursor;
        static Gdk::Cursor* trimmer_cursor;
@@ -1094,6 +1007,8 @@ 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*, bool from_autoscroll = false);
        bool enter_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
@@ -1105,28 +1020,12 @@ class Editor : public PublicEditor
 
        int ensure_cursor (nframes64_t* pos);
 
-       void handle_new_region (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>);
-
-       std::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);
@@ -1144,7 +1043,6 @@ class Editor : public PublicEditor
        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);
@@ -1189,7 +1087,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);
@@ -1253,9 +1150,6 @@ class Editor : public PublicEditor
        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 (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, 
@@ -1391,11 +1285,8 @@ class Editor : public PublicEditor
        /// Snap threshold in pixels
        double snap_threshold;
 
-       void handle_gui_changes (const std::string &, void *);
        bool ignore_gui_changes;
 
-       void    hide_all_tracks (bool with_select);
-
        Drag* _drag;
 
        void break_drag ();
@@ -1597,7 +1488,8 @@ public:
        void redisplay_tempo (bool immediate_redraw);
        
        void snap_to (nframes64_t& first, 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);
+
        double snap_length_beats (nframes64_t start);
 
        uint32_t bbt_beat_subdivision;
@@ -1623,17 +1515,19 @@ public:
        
        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;
@@ -1688,25 +1582,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 ();
        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 */
@@ -1764,117 +1645,19 @@ public:
 
        ArdourCanvas::SimpleRect   *zoom_rect;
        void reposition_zoom_rect (nframes64_t start, nframes64_t end);
+
+       EditorRouteGroups* _route_groups;
+       EditorRoutes* _routes;
+       EditorRegions* _regions;
+       EditorSnapshots* _snapshots;
        
        /* diskstream/route display management */
        Glib::RefPtr<Gdk::Pixbuf> rec_enabled_icon;
        Glib::RefPtr<Gdk::Pixbuf> rec_disabled_icon;
 
-       struct RouteDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
-           RouteDisplayModelColumns() { 
-                   add (text);
-                   add (visible);
-                   add (rec_enabled);
-                   add (temporary_visible);
-                   add (is_track);
-                   add (tv);
-                   add (route);
-           }
-           Gtk::TreeModelColumn<Glib::ustring>  text;
-           Gtk::TreeModelColumn<bool>           visible;
-           Gtk::TreeModelColumn<bool>           rec_enabled;
-           Gtk::TreeModelColumn<bool>           temporary_visible;
-           Gtk::TreeModelColumn<bool>           is_track;
-           Gtk::TreeModelColumn<TimeAxisView*>  tv;
-           Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> >  route;
-       };
-
-       void on_tv_rec_enable_toggled(const Glib::ustring& path_string);
-
-       RouteDisplayModelColumns         route_display_columns;
-       Glib::RefPtr<Gtk::ListStore>     route_display_model;
        Glib::RefPtr<Gtk::TreeSelection> route_display_selection;
 
-       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;
-       bool sync_track_view_list_and_route_list ();
-
-       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;
-       };
-
-       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;
 
@@ -1939,14 +1722,6 @@ public:
                        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,
@@ -2018,10 +1793,10 @@ 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 */
 
@@ -2218,7 +1993,8 @@ public:
        BundleManager* _bundle_manager;
        GlobalPortMatrixWindow* _global_port_matrix[ARDOUR::DataType::num_types];
 
-       void fit_tracks ();
+       void fit_tracks (TrackSelection &);
+       void fit_selected_tracks ();
        void set_track_height (uint32_t h);
 
        void remove_tracks ();
@@ -2243,6 +2019,7 @@ public:
        void streamview_height_changed ();
 
        EditorGroupTabs* _group_tabs;
+       void fit_route_group (ARDOUR::RouteGroup *);
 
        friend class Drag;
        friend class RegionDrag;
@@ -2270,6 +2047,8 @@ public:
 
        friend class EditorSummary;
        friend class EditorGroupTabs;
+
+       friend class EditorRoutes;
 };
 
 #endif /* __ardour_editor_h__ */