X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.h;h=a77454a5e0883767340d794905240127929d9cbd;hb=2e1332f74f803a1be4c8bb4911266aef4b63f145;hp=aaaa7397e87c14740013193a0595145212376c58;hpb=f6652f07ae2bfa9d7984c5b6feffd6479faec034;p=ardour.git

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index aaaa7397e8..a77454a5e0 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -595,7 +595,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;
 
@@ -1305,7 +1305,7 @@ class Editor : public PublicEditor
 
 	/* import specific info */
 
-	struct EditorImportStatus : public ARDOUR::Session::import_status {
+	struct EditorImportStatus : public ARDOUR::Session::ImportStatus {
 	    Editing::ImportMode mode;
 	    nframes64_t pos;
 	    int target_tracks;
@@ -2356,12 +2356,6 @@ public:
 
 	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 ();
@@ -2376,6 +2370,9 @@ public:
 
 	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;
 };
 
 #endif /* __ardour_editor_h__ */