first vaguely working version using PresentationInfo

[ardour.git] / gtk2_ardour / editor_routes.h

diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index dea8da6cc08b17d2676c30b37fc149a1e82768d3..cd2e4deb43b412bfff657c43c3c9134548fde49f 100644 (file)
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -38,17 +38,19 @@ 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 ();
@@ -59,20 +61,22 @@ 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_presentation_info_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_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 sync_treeview_from_presentation_info ();
        void row_deleted (Gtk::TreeModel::Path const &);
        void visible_changed (std::string const &);
        void active_changed (std::string const &);
@@ -80,9 +84,10 @@ private:
        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);
+       void update_solo_display ();
        void update_solo_isolate_display ();
        void update_solo_safe_display ();
        void update_input_active_display ();
@@ -98,7 +103,9 @@ private:
        void show_all_miditracks ();
        void hide_all_miditracks ();
        void show_tracks_with_regions_at_playhead ();
-        void selection_changed ();
+       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
@@ -113,6 +120,7 @@ private:
                        add (text);
                        add (visible);
                        add (rec_state);
+                       add (rec_safe);
                        add (mute_state);
                        add (solo_state);
                        add (solo_visible);
@@ -130,6 +138,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 */
@@ -155,22 +164,25 @@ private:
 
        bool _ignore_reorder;
        bool _no_redisplay;
-        bool _adding_routes;
-        bool _route_deletion_in_progress;
+       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__ */