take process lock when adding processors:

[ardour.git] / gtk2_ardour / editor_routes.h

diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index 48b944acd790264d25bf8b5bab1c9d34f5ad0f71..e07a7787aad886248f13082889b5087f3c3b8b5d 100644 (file)
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -42,6 +42,10 @@ public:
                _no_redisplay = true;
        }
 
+        void allow_redisplay () { 
+               _no_redisplay = false;
+       }
+
        void resume_redisplay () {
                _no_redisplay = false;
                redisplay ();
@@ -55,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 &);
@@ -68,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 ();
        void route_deleted (Gtk::TreeModel::Path const &);
        void visible_changed (std::string const &);
        void active_changed (std::string const &);
@@ -98,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 ();
@@ -110,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);
@@ -124,8 +129,10 @@ private:
                Gtk::TreeModelColumn<std::string>    text;
                Gtk::TreeModelColumn<bool>           visible;
                Gtk::TreeModelColumn<uint32_t>       rec_state;
-               Gtk::TreeModelColumn<Gtkmm2ext::ActiveState>  mute_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;
@@ -147,8 +154,7 @@ private:
 
        bool _ignore_reorder;
        bool _no_redisplay;
-       bool _redisplay_does_not_sync_order_keys;
-       bool _redisplay_does_not_reset_order_keys;
+        bool _adding_routes;
 
        Gtk::Menu* _menu;
         Gtk::Widget* old_focus;