Tab to prev/next name-entry: skip only rec-armed tracks

[ardour.git] / gtk2_ardour / editor_routes.h

diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index d0c32a8e8b2278364cf8c16105a3a804db1c51d8..e9497edbbec566cf497cff1d234d50ced8d68d92 100644 (file)
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -20,10 +20,18 @@
 #ifndef __ardour_gtk_editor_route_h__
 #define __ardour_gtk_editor_route_h__
 
+#include <gtkmm/liststore.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treestore.h>
+
 #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,11 +46,12 @@ public:
        void move_selected_tracks (bool);
        void show_track_in_display (TimeAxisView &);
 
-       bool _redisplay_on_resume;
 
        void suspend_redisplay () {
-               _redisplay_on_resume = false;
-               _no_redisplay = true;
+               if (!_no_redisplay) {
+                       _no_redisplay = true;
+                       _redisplay_on_resume = false;
+               }
        }
 
        void resume_redisplay () {
@@ -54,38 +63,38 @@ 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_order_keys_from_treeview ();
-       void reset_remote_control_ids ();
+       void sync_presentation_info_from_treeview ();
+       void sync_treeview_from_presentation_info (PBD::PropertyChange const &);
 
 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 presentation_info_changed (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 ();
@@ -103,9 +112,7 @@ private:
        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
-               );
+       int plugin_setup (boost::shared_ptr<ARDOUR::Route>, boost::shared_ptr<ARDOUR::PluginInsert>, ARDOUR::Route::PluginSetupOptions);
 
        bool selection_filter (Glib::RefPtr<Gtk::TreeModel> const &, Gtk::TreeModel::Path const &, bool);
        void name_edit (std::string const &, std::string const &);
@@ -116,40 +123,46 @@ private:
                        add (text);
                        add (visible);
                        add (rec_state);
+                       add (rec_safe);
                        add (mute_state);
                        add (solo_state);
                        add (solo_visible);
+                       add (solo_lock_iso_visible);
                        add (solo_isolate_state);
                        add (solo_safe_state);
                        add (is_track);
                        add (tv);
-                       add (route);
+                       add (stripable);
                        add (name_editable);
                        add (is_input_active);
                        add (is_midi);
+                       add (no_vca);
                        add (active);
                }
 
                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 */
                Gtk::TreeModelColumn<bool>           solo_visible;
+               Gtk::TreeModelColumn<bool>           solo_lock_iso_visible;
                Gtk::TreeModelColumn<uint32_t>       solo_isolate_state;
                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;
+               Gtk::TreeModelColumn<bool>           no_vca; // activatable
                Gtk::TreeModelColumn<bool>           active;
        };
 
        Gtk::ScrolledWindow _scroller;
-       Gtkmm2ext::DnDTreeView<boost::shared_ptr<ARDOUR::Route> > _display;
+       Gtk::TreeView _display;
        Glib::RefPtr<Gtk::ListStore> _model;
        ModelColumns _columns;
        int _name_column;
@@ -157,15 +170,16 @@ private:
        int _active_column;
 
        bool _ignore_reorder;
+       bool _ignore_selection_change;
        bool _no_redisplay;
        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);