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

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 2a5b416ae0..01460b61dc 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_mixer_ui_h__
@@ -38,8 +37,7 @@
 #include <ardour/ardour.h>
 #include <ardour/io.h>
 
-#include "keyboard_target.h"
-#include "route_redirect_selection.h"
+#include "route_processor_selection.h"
 #include "enums.h"
 
 namespace ARDOUR {
@@ -47,7 +45,6 @@ namespace ARDOUR {
 	class RouteGroup;
 	class Session;
 	class AudioDiskstream;
-	class AudioEngine;
 };
 
 class MixerStrip;
@@ -56,7 +53,7 @@ class PluginSelector;
 class Mixer_UI : public Gtk::Window
 {
   public:
-	Mixer_UI (ARDOUR::AudioEngine&);
+	Mixer_UI ();
 	~Mixer_UI();
 
 	void connect_to_session (ARDOUR::Session *);
@@ -78,33 +75,42 @@ 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::AudioEngine&     engine;
 	ARDOUR::Session         *session;
 
-	bool _visible;
+	bool					_visible;
+	
+	Gtk::HBox				global_hpacker;
+	Gtk::VBox				global_vpacker;
+	Gtk::ScrolledWindow		scroller;
+	Gtk::EventBox			scroller_base;
+	Gtk::HBox				scroller_hpacker;
+	Gtk::VBox				mixer_scroller_vpacker;
+	Gtk::VBox				list_vpacker;
+	Gtk::Label				group_display_button_label;
+	Gtk::Button				group_display_button;
+	Gtk::ScrolledWindow		track_display_scroller;
+	Gtk::ScrolledWindow		group_display_scroller;
+	Gtk::VBox				group_display_vbox;
+	Gtk::Frame				track_display_frame;
+	Gtk::Frame				group_display_frame;
+	Gtk::VPaned				rhs_pane1;
+	Gtk::HBox				strip_packer;
+	Gtk::HBox				out_packer;
+	Gtk::HPaned				list_hpane;
+
+	// for restoring window geometry.
+	int m_root_x, m_root_y, m_width, m_height;
 	
-	Gtk::HBox                global_hpacker;
-	Gtk::VBox                global_vpacker;
-	Gtk::ScrolledWindow      scroller;
-	Gtk::EventBox            scroller_base;
-	Gtk::HBox                scroller_hpacker;
-	Gtk::VBox                mixer_scroller_vpacker;
-	Gtk::VBox                list_vpacker;
-	Gtk::Label               group_display_button_label;
-	Gtk::Button              group_display_button;
-	Gtk::ScrolledWindow      track_display_scroller;
-	Gtk::ScrolledWindow      group_display_scroller;
-	Gtk::VBox		 group_display_vbox;
-	Gtk::Frame 		 track_display_frame;
-	Gtk::Frame		 group_display_frame;
-	Gtk::VPaned		 rhs_pane1;
-	Gtk::HBox                strip_packer;
-	Gtk::HBox                out_packer;
-	Gtk::HPaned		 list_hpane;
+	void set_window_pos_and_size ();
+	void get_window_pos_and_size ();
 
 	bool on_key_press_event (GdkEventKey*);
 
@@ -125,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);
 
@@ -146,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 ();
@@ -182,7 +192,7 @@ class Mixer_UI : public Gtk::Window
 
 	PluginSelector    *_plugin_selector;
 
-	void strip_name_changed (void *src, MixerStrip *);
+	void strip_name_changed (MixerStrip *);
 
 	void group_flags_changed (void *src, ARDOUR::RouteGroup *);
 
@@ -208,10 +218,10 @@ class Mixer_UI : public Gtk::Window
 		    add (text);
 		    add (group);
 	    }
-	    Gtk::TreeModelColumn<bool>                active;
-	    Gtk::TreeModelColumn<bool>  visible;
-	    Gtk::TreeModelColumn<Glib::ustring>       text;
-	    Gtk::TreeModelColumn<ARDOUR::RouteGroup*> group;
+	    Gtk::TreeModelColumn<bool>					active;
+	    Gtk::TreeModelColumn<bool>					visible;
+	    Gtk::TreeModelColumn<Glib::ustring>			text;
+	    Gtk::TreeModelColumn<ARDOUR::RouteGroup*>	group;
 	};
 
 	TrackDisplayModelColumns    track_columns;
@@ -232,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;
 };