Include ParameterDescriptor in read-only control output

[ardour.git] / gtk2_ardour / route_ui.h

diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 75dab9fb233e4df0b2c0322d01bd17bf1183e3c7..7e4dd2e9688bc4669ea9a6e440461552351936de 100644 (file)
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -26,6 +26,7 @@
 #include "pbd/signals.h"
 
 #include <gtkmm/textview.h>
+#include <gtkmm/colorselection.h>
 
 #include "gtkmm2ext/widget_state.h"
 
@@ -40,6 +41,7 @@
 
 #include "axis_view.h"
 #include "selectable.h"
+#include "stripable_colorpicker.h"
 #include "window_manager.h"
 
 namespace ARDOUR {
@@ -74,7 +76,7 @@ class RoutePinWindowProxy : public WM::ProxyBase
        PBD::ScopedConnection going_away_connection;
 };
 
-class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual PBD::ScopedConnectionList, public virtual Selectable, public virtual sigc::trackable
+class RouteUI : public virtual Selectable, public virtual ARDOUR::SessionHandlePtr, public virtual PBD::ScopedConnectionList, public virtual sigc::trackable
 {
   public:
        RouteUI (ARDOUR::Session*);
@@ -123,8 +125,8 @@ class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual PBD::Sco
 
        Glib::RefPtr<Gdk::Pixbuf> solo_safe_pixbuf;
 
-        ArdourButton* solo_safe_led;
-        ArdourButton* solo_isolated_led;
+       ArdourButton* solo_safe_led;
+       ArdourButton* solo_isolated_led;
 
 
        Gtk::Label monitor_input_button_label;
@@ -184,8 +186,8 @@ class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual PBD::Sco
        void solo_isolated_toggle (void*, Gtk::CheckMenuItem*);
        void toggle_solo_isolated (Gtk::CheckMenuItem*);
 
-        bool solo_isolate_button_release (GdkEventButton*);
-        bool solo_safe_button_release (GdkEventButton*);
+       bool solo_isolate_button_release (GdkEventButton*);
+       bool solo_safe_button_release (GdkEventButton*);
 
        void solo_safe_toggle (void*, Gtk::CheckMenuItem*);
        void toggle_solo_safe (Gtk::CheckMenuItem*);
@@ -217,8 +219,8 @@ class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual PBD::Sco
        void set_route_active (bool, bool);
        void duplicate_selected_routes ();
 
-        Gtk::Menu* record_menu;
-        void build_record_menu ();
+       Gtk::Menu* record_menu;
+       void build_record_menu ();
 
        Gtk::CheckMenuItem *step_edit_item;
        void toggle_step_edit ();
@@ -282,10 +284,10 @@ class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual PBD::Sco
        void reset ();
 
        void self_delete ();
-        virtual void start_step_editing () {}
-        virtual void stop_step_editing() {}
+       virtual void start_step_editing () {}
+       virtual void stop_step_editing() {}
 
-        void set_invert_sensitive (bool);
+       void set_invert_sensitive (bool);
        bool verify_new_route_name (const std::string& name);
 
        void route_gui_changed (PBD::PropertyChange const&);
@@ -336,6 +338,8 @@ private:
        std::vector<ArdourButton*> _invert_buttons;
        Gtk::Menu* _invert_menu;
 
+       StripableColorDialog _color_picker;
+
        static void set_showing_sends_to (boost::shared_ptr<ARDOUR::Route>);
        static boost::weak_ptr<ARDOUR::Route> _showing_sends_to;