X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_routes.h;h=4933a9496fe88c36a8bad01a6117d73a30e59c19;hb=f2009ea7771048a89463fea25f0bad9de1e17567;hp=3efde73288e70f0a2416972d53e3f06adb217a23;hpb=ce6d99ccb50350b5f25ae34009a245bd8e22ba4e;p=ardour.git

diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index 3efde73288..4933a9496f 100644
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -21,6 +21,7 @@
 #define __ardour_gtk_editor_route_h__
 
 #include "pbd/signals.h"
+#include "gtkmm2ext/widget_state.h"
 #include "editor_component.h"
 
 class EditorRoutes : public EditorComponent, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
@@ -41,6 +42,10 @@ public:
 		_no_redisplay = true;
 	}
 
+        void allow_redisplay () { 
+		_no_redisplay = false;
+	}
+
 	void resume_redisplay () {
 		_no_redisplay = false;
 		redisplay ();
@@ -54,10 +59,10 @@ public:
 	std::list<TimeAxisView*> views () const;
 	void hide_all_tracks (bool);
 	void clear ();
-	void sync_order_keys (std::string const &);
+        void sync_order_keys_from_treeview ();
+        void reset_remote_control_ids ();
 
 private:
-
 	void initial_display ();
 	void on_input_active_changed (std::string const &);
 	void on_tv_rec_enable_changed (std::string const &);
@@ -67,6 +72,7 @@ private:
 	void on_tv_solo_safe_toggled (std::string const &);
 	void build_menu ();
 	void show_menu ();
+        void sync_treeview_from_order_keys (ARDOUR::RouteSortOrderKey);
 	void route_deleted (Gtk::TreeModel::Path const &);
 	void visible_changed (std::string const &);
 	void active_changed (std::string const &);
@@ -97,7 +103,6 @@ private:
 		Glib::RefPtr<Gdk::DragContext> const &, gint, gint, Gtk::SelectionData const &, guint, guint
 		);
 
-	void track_list_reorder (Gtk::TreeModel::Path const &, Gtk::TreeModel::iterator const & iter, int* new_order);
 	bool selection_filter (Glib::RefPtr<Gtk::TreeModel> const &, Gtk::TreeModel::Path const &, bool);
 	void name_edit (std::string const &, std::string const &);
 	void solo_changed_so_update_mute ();
@@ -109,6 +114,7 @@ private:
 			add (rec_state);
 			add (mute_state);
 			add (solo_state);
+			add (solo_visible);
 			add (solo_isolate_state);
 			add (solo_safe_state);
 			add (is_track);
@@ -125,6 +131,8 @@ private:
 		Gtk::TreeModelColumn<uint32_t>       rec_state;
 		Gtk::TreeModelColumn<uint32_t>       mute_state;
 		Gtk::TreeModelColumn<uint32_t>       solo_state;
+		/** true if the solo buttons are visible for this route, otherwise false */
+		Gtk::TreeModelColumn<bool>           solo_visible;
 		Gtk::TreeModelColumn<uint32_t>       solo_isolate_state;
 		Gtk::TreeModelColumn<uint32_t>       solo_safe_state;
 		Gtk::TreeModelColumn<bool>           is_track;
@@ -146,8 +154,6 @@ private:
 
 	bool _ignore_reorder;
 	bool _no_redisplay;
-	bool _redisplay_does_not_sync_order_keys;
-	bool _redisplay_does_not_reset_order_keys;
 
 	Gtk::Menu* _menu;
         Gtk::Widget* old_focus;