X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_routes.h;h=e1bf61e82eb660f336ada67245d7c41ce7be7a7b;hb=419006dd834827f22be9a73753c2355214b3cdc9;hp=e07a7787aad886248f13082889b5087f3c3b8b5d;hpb=5b62e88fbf1022a48c50c9975c2a81a05ecdbb0c;p=ardour.git

diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index e07a7787aa..e1bf61e82e 100644
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -22,8 +22,11 @@
 
 #include "pbd/signals.h"
 #include "gtkmm2ext/widget_state.h"
+
 #include "editor_component.h"
 
+class VCATimeAxisView;
+
 class EditorRoutes : public EditorComponent, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
 {
 public:
@@ -38,51 +41,56 @@ public:
 	void move_selected_tracks (bool);
 	void show_track_in_display (TimeAxisView &);
 
-	void suspend_redisplay () {
-		_no_redisplay = true;
-	}
 
-        void allow_redisplay () { 
-		_no_redisplay = false;
+	void suspend_redisplay () {
+		if (!_no_redisplay) {
+			_no_redisplay = true;
+			_redisplay_on_resume = false;
+		}
 	}
 
 	void resume_redisplay () {
 		_no_redisplay = false;
-		redisplay ();
+		if (_redisplay_on_resume) {
+			redisplay ();
+		}
 	}
 
 	void redisplay ();
 	void update_visibility ();
-	void routes_added (std::list<RouteTimeAxisView*> routes);
+	void time_axis_views_added (std::list<TimeAxisView*>);
 	void route_removed (TimeAxisView *);
 	void hide_track_in_display (TimeAxisView &);
 	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_presentation_info_from_treeview ();
 
 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_rec_safe_toggled (std::string const &);
 	void on_tv_mute_enable_toggled (std::string const &);
 	void on_tv_solo_enable_toggled (std::string const &);
 	void on_tv_solo_isolate_toggled (std::string const &);
 	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 presentation_info_changed (PBD::PropertyChange const &);
+	void sync_treeview_from_presentation_info (PBD::PropertyChange const &);
+	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 route_property_changed (const PBD::PropertyChange&, boost::weak_ptr<ARDOUR::Stripable>);
 	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);
+	void update_solo_display ();
 	void update_solo_isolate_display ();
 	void update_solo_safe_display ();
 	void update_input_active_display ();
@@ -98,6 +106,9 @@ private:
 	void show_all_miditracks ();
 	void hide_all_miditracks ();
 	void show_tracks_with_regions_at_playhead ();
+	void selection_changed ();
+
+	int plugin_setup (boost::shared_ptr<ARDOUR::Route>, boost::shared_ptr<ARDOUR::PluginInsert>, ARDOUR::Route::PluginSetupOptions);
 
 	void display_drag_data_received (
 		Glib::RefPtr<Gdk::DragContext> const &, gint, gint, Gtk::SelectionData const &, guint, guint
@@ -112,6 +123,7 @@ private:
 			add (text);
 			add (visible);
 			add (rec_state);
+			add (rec_safe);
 			add (mute_state);
 			add (solo_state);
 			add (solo_visible);
@@ -119,7 +131,7 @@ private:
 			add (solo_safe_state);
 			add (is_track);
 			add (tv);
-			add (route);
+			add (stripable);
 			add (name_editable);
 			add (is_input_active);
 			add (is_midi);
@@ -129,6 +141,7 @@ private:
 		Gtk::TreeModelColumn<std::string>    text;
 		Gtk::TreeModelColumn<bool>           visible;
 		Gtk::TreeModelColumn<uint32_t>       rec_state;
+		Gtk::TreeModelColumn<uint32_t>       rec_safe;
 		Gtk::TreeModelColumn<uint32_t>       mute_state;
 		Gtk::TreeModelColumn<uint32_t>       solo_state;
 		/** true if the solo buttons are visible for this route, otherwise false */
@@ -137,7 +150,7 @@ private:
 		Gtk::TreeModelColumn<uint32_t>       solo_safe_state;
 		Gtk::TreeModelColumn<bool>           is_track;
 		Gtk::TreeModelColumn<TimeAxisView*>  tv;
-		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> >  route;
+		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Stripable> >  stripable;
 		Gtk::TreeModelColumn<bool>           name_editable;
 		Gtk::TreeModelColumn<bool>           is_input_active;
 		Gtk::TreeModelColumn<bool>           is_midi;
@@ -153,22 +166,27 @@ private:
 	int _active_column;
 
 	bool _ignore_reorder;
+	bool _ignore_selection_change;
 	bool _no_redisplay;
-        bool _adding_routes;
+	bool _adding_routes;
+	bool _route_deletion_in_progress;
+	bool _redisplay_on_resume;
+	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__ */