X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.h;h=01460b61dcb7f20b6c871dfb778a1af5e0571339;hb=d8ade6d30595a3a8be343b392e47d422940eac27;hp=2851763ba508bcea0cf327b478b64924f894465f;hpb=74eded425a5244831c80968c1781c3f81f90e996;p=ardour.git

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 2851763ba5..01460b61dc 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -75,8 +75,12 @@ class Mixer_UI : public Gtk::Window
 	void hide_strip (MixerStrip *);
 
 	void ensure_float (Gtk::Window&);
+	void toggle_auto_rebinding ();
+	void set_auto_rebinding(bool);
 
 	RouteRedirectSelection& selection() { return _selection; }
+
+	static const char* get_order_key();
 	
   private:
 	ARDOUR::Session         *session;
@@ -102,6 +106,12 @@ class Mixer_UI : public Gtk::Window
 	Gtk::HBox				out_packer;
 	Gtk::HPaned				list_hpane;
 
+	// for restoring window geometry.
+	int m_root_x, m_root_y, m_width, m_height;
+	
+	void set_window_pos_and_size ();
+	void get_window_pos_and_size ();
+
 	bool on_key_press_event (GdkEventKey*);
 
 	void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*);
@@ -121,6 +131,9 @@ class Mixer_UI : public Gtk::Window
 	void unselect_all_audiobus_strips ();
 	void select_all_audiobus_strips ();
 
+	void auto_rebind_midi_controls ();
+	bool auto_rebinding;
+
 	void strip_select_op (bool audiotrack, bool select);
 	void select_strip_op (MixerStrip*, bool select);
 
@@ -142,6 +155,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 ();
@@ -228,6 +242,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;
 };