PBD::Signal<...>::connect() is already thread safe, so drop intermediate proxy/call_s...

[ardour.git] / gtk2_ardour / editor_routes.h

diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index 7065a2cd4b3b085169b9a02656c4ba21dbfc1bee..e1bf61e82eb660f336ada67245d7c41ce7be7a7b 100644 (file)
--- 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:
@@ -55,14 +58,13 @@ public:
 
        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_presentation_info_from_treeview ();
-       void reset_remote_control_ids ();
 
 private:
        void initial_display ();
@@ -76,13 +78,14 @@ private:
        void on_tv_solo_safe_toggled (std::string const &);
        void build_menu ();
        void show_menu ();
-       void sync_treeview_from_presentation_info ();
+       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 ();
@@ -163,6 +166,7 @@ private:
        int _active_column;
 
        bool _ignore_reorder;
+       bool _ignore_selection_change;
        bool _no_redisplay;
        bool _adding_routes;
        bool _route_deletion_in_progress;