Fix double separator on session range context menu.

[ardour.git] / gtk2_ardour / editor_routes.h

diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index 2ade937eff362b822ed549729b82f602a819495b..5fad890faffff1260365e4b1da8dc892b130f9ac 100644 (file)
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -21,6 +21,7 @@
 #define __ardour_gtk_editor_route_h__
 
 #include "pbd/signals.h"
+#include "gtkmm2ext/widget_state.h"
 #include "editor_component.h"
 
 class EditorRoutes : public EditorComponent, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
@@ -69,6 +70,7 @@ private:
        void show_menu ();
        void route_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>);
@@ -79,6 +81,7 @@ private:
        void update_solo_isolate_display ();
        void update_solo_safe_display ();
        void update_input_active_display ();
+       void update_active_display ();
        void set_all_tracks_visibility (bool);
        void set_all_audio_midi_visibility (int, bool);
        void show_all_routes ();
@@ -107,6 +110,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);
@@ -115,6 +119,7 @@ private:
                        add (name_editable);
                        add (is_input_active);
                        add (is_midi);
+                       add (active);
                }
 
                Gtk::TreeModelColumn<std::string>    text;
@@ -122,6 +127,8 @@ private:
                Gtk::TreeModelColumn<uint32_t>       rec_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;
@@ -130,6 +137,7 @@ private:
                Gtk::TreeModelColumn<bool>           name_editable;
                Gtk::TreeModelColumn<bool>           is_input_active;
                Gtk::TreeModelColumn<bool>           is_midi;
+               Gtk::TreeModelColumn<bool>           active;
        };
 
        Gtk::ScrolledWindow _scroller;
@@ -138,6 +146,7 @@ private:
        ModelColumns _columns;
        int _name_column;
        int _visible_column;
+       int _active_column;
 
        bool _ignore_reorder;
        bool _no_redisplay;