distinguish global peak-reset button from meters:

[ardour.git] / gtk2_ardour / editor_routes.h

diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index 008304303f5bc879ab2d51ebc7b86f76d232516d..21a92fc423746252be3d1cf9423ec8f513e3d0f0 100644 (file)
--- 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,9 +55,10 @@ public:
        std::list<TimeAxisView*> views () const;
        void hide_all_tracks (bool);
        void clear ();
-        void sync_order_keys_from_model ();
-private:
+        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 &);
@@ -71,8 +68,8 @@ private:
        void on_tv_solo_safe_toggled (std::string const &);
        void build_menu ();
        void show_menu ();
-        void sync_model_from_order_keys (ARDOUR::RouteSortOrderKey);
-       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 *);
@@ -97,6 +94,7 @@ private:
        void show_all_miditracks ();
        void hide_all_miditracks ();
        void show_tracks_with_regions_at_playhead ();
+        void selection_changed ();
 
        void display_drag_data_received (
                Glib::RefPtr<Gdk::DragContext> const &, gint, gint, Gtk::SelectionData const &, guint, guint
@@ -153,6 +151,8 @@ private:
 
        bool _ignore_reorder;
        bool _no_redisplay;
+        bool _adding_routes;
+        bool _route_deletion_in_progress;
 
        Gtk::Menu* _menu;
         Gtk::Widget* old_focus;