merge from 2.0-ongoing by hand, minus key binding editor

git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 0 deletions

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 3c9355efb7..5d00acff5b 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -77,6 +77,8 @@ class Mixer_UI : public Gtk::Window
 	void ensure_float (Gtk::Window&);
 
 	RouteRedirectSelection& selection() { return _selection; }
+
+	static const char* get_order_key();
 	
   private:
 	ARDOUR::Session         *session;
@@ -148,6 +150,7 @@ class Mixer_UI : public Gtk::Window
 	
 	void track_list_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&);
 	void track_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_track_display ();
 	void show_track_list_menu ();
@@ -234,6 +237,10 @@ class Mixer_UI : public Gtk::Window
 
 	Width _strip_width;
 
+	void sync_order_keys ();
+	bool ignore_route_reorder;
+	bool ignore_sync;
+
 	static const int32_t default_width = 478;
 	static const int32_t default_height = 765;
 };