X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.h;h=4f1c6823e76ce5cc9400f9ecebd1e1bc8b627197;hb=9041d7bc18e97e41da4df84a350c63290825cf44;hp=08d7b6e487f5c077a001e321cf8aeab97dfff2f5;hpb=f6e869d50d63b9ec5e27f9349392d6725832d49a;p=ardour.git

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 08d7b6e487..4f1c6823e7 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -37,8 +37,11 @@
 #include "pbd/signals.h"
 
 #include "ardour/ardour.h"
+#include "ardour/types.h"
 #include "ardour/session_handle.h"
 
+#include "gtkmm2ext/visibility_tracker.h"
+
 #include "enums.h"
 #include "mixer_actor.h"
 
@@ -52,7 +55,7 @@ class PluginSelector;
 class MixerGroupTabs;
 class MonitorSection;
 
-class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public MixerActor
+class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public MixerActor, public Gtkmm2ext::VisibilityTracker
 {
   public:
 	static Mixer_UI* instance();
@@ -63,7 +66,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 
 	PluginSelector* plugin_selector();
 
-	void  set_strip_width (Width);
+	void  set_strip_width (Width, bool save = false);
 	Width get_strip_width () const { return _strip_width; }
 
 	void unselect_strip_in_display (MixerStrip*);
@@ -128,8 +131,9 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	bool strip_scroller_button_release (GdkEventButton*);
 	void scroll_left ();
 	void scroll_right ();
+        void toggle_midi_input_active (bool flip_others);
 
-	void add_strip (ARDOUR::RouteList&);
+	void add_strips (ARDOUR::RouteList&);
 	void remove_strip (MixerStrip *);
 
 	MixerStrip* strip_by_route (boost::shared_ptr<ARDOUR::Route>);
@@ -160,15 +164,16 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	bool track_display_button_press (GdkEventButton*);
 	void strip_width_changed ();
 
-	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 ();
-
+      
 	void set_all_strips_visibility (bool yn);
 	void set_all_audio_visibility (int tracks, bool yn);
+        void track_visibility_changed (std::string const & path);
+        void update_track_visibility ();
 
 	void hide_all_routes ();
 	void show_all_routes ();
@@ -244,10 +249,12 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 
 	Width _strip_width;
 
-	void sync_order_keys (std::string const &);
-	bool strip_redisplay_does_not_reset_order_keys;
-	bool strip_redisplay_does_not_sync_order_keys;
-	bool ignore_sync;
+        void sync_order_keys_from_treeview ();
+        void sync_treeview_from_order_keys (ARDOUR::RouteSortOrderKey);
+        void reset_remote_control_ids ();
+        void reset_order_keys (ARDOUR::RouteSortOrderKey);
+
+        bool ignore_reorder;
 
 	void parameter_changed (std::string const &);
 	void set_route_group_activation (ARDOUR::RouteGroup *, bool);