X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_routes.h;h=8213e653ecae304aae19a3e6540119cb13bb5a8c;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=9780307435adf3d3b38110a8961607cc06ea70e2;hpb=012504d35af5ece8ddc9bd96ef679f670112235a;p=ardour.git

diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index 9780307435..8213e653ec 100644
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -42,10 +42,6 @@ public:
 		_no_redisplay = true;
 	}
 
-        void allow_redisplay () { 
-		_no_redisplay = false;
-	}
-
 	void resume_redisplay () {
 		_no_redisplay = false;
 		redisplay ();
@@ -59,11 +55,12 @@ public:
 	std::list<TimeAxisView*> views () const;
 	void hide_all_tracks (bool);
 	void clear ();
-        void sync_order_keys_from_treeview ();
-        void reset_remote_control_ids ();
+	void sync_order_keys_from_treeview ();
+	void reset_remote_control_ids ();
 
 private:
 	void initial_display ();
+	void redisplay_real ();
 	void on_input_active_changed (std::string const &);
 	void on_tv_rec_enable_changed (std::string const &);
 	void on_tv_mute_enable_toggled (std::string const &);
@@ -72,14 +69,15 @@ private:
 	void on_tv_solo_safe_toggled (std::string const &);
 	void build_menu ();
 	void show_menu ();
-        void sync_treeview_from_order_keys ();
-	void route_deleted (Gtk::TreeModel::Path const &);
+	void sync_treeview_from_order_keys ();
+	void row_deleted (Gtk::TreeModel::Path const &);
 	void visible_changed (std::string const &);
 	void active_changed (std::string const &);
 	void reordered (Gtk::TreeModel::Path const &, Gtk::TreeModel::iterator const &, int *);
 	bool button_press (GdkEventButton *);
 	void route_property_changed (const PBD::PropertyChange&, boost::weak_ptr<ARDOUR::Route>);
 	void handle_gui_changes (std::string const &, void *);
+	bool idle_update_mute_rec_solo_etc ();
 	void update_rec_display ();
 	void update_mute_display ();
 	void update_solo_display (bool);
@@ -98,7 +96,7 @@ private:
 	void show_all_miditracks ();
 	void hide_all_miditracks ();
 	void show_tracks_with_regions_at_playhead ();
-        void selection_changed ();
+	void selection_changed ();
 
 	void display_drag_data_received (
 		Glib::RefPtr<Gdk::DragContext> const &, gint, gint, Gtk::SelectionData const &, guint, guint
@@ -155,21 +153,24 @@ private:
 
 	bool _ignore_reorder;
 	bool _no_redisplay;
-        bool _adding_routes;
+	bool _adding_routes;
+	bool _route_deletion_in_progress;
+	volatile gint _redisplay_active;
+	volatile gint _queue_tv_update;
 
 	Gtk::Menu* _menu;
-        Gtk::Widget* old_focus;
-        uint32_t selection_countdown;
-        Gtk::CellEditable* name_editable;
-
-        bool key_press (GdkEventKey* ev);
-        bool focus_in (GdkEventFocus*);
-        bool focus_out (GdkEventFocus*);
-        bool enter_notify (GdkEventCrossing*);
-        bool leave_notify (GdkEventCrossing*);
-        void name_edit_started (Gtk::CellEditable*, const Glib::ustring&);
-
-        bool get_relevant_routes (boost::shared_ptr<ARDOUR::RouteList> rl);
+	Gtk::Widget* old_focus;
+	uint32_t selection_countdown;
+	Gtk::CellEditable* name_editable;
+
+	bool key_press (GdkEventKey* ev);
+	bool focus_in (GdkEventFocus*);
+	bool focus_out (GdkEventFocus*);
+	bool enter_notify (GdkEventCrossing*);
+	bool leave_notify (GdkEventCrossing*);
+	void name_edit_started (Gtk::CellEditable*, const Glib::ustring&);
+
+	bool get_relevant_routes (boost::shared_ptr<ARDOUR::RouteList> rl);
 };
 
 #endif /* __ardour_gtk_editor_route_h__ */