more changes flowing from a persistent MonitorSection object

[ardour.git] / gtk2_ardour / vca_time_axis.h

diff --git a/gtk2_ardour/vca_time_axis.h b/gtk2_ardour/vca_time_axis.h
index 128c3c478a7a01f083b2e0c0baacb39c7aa88b40..6d4cf5ffbd28c36541a8c3e4d783682a3d92de47 100644 (file)
--- a/gtk2_ardour/vca_time_axis.h
+++ b/gtk2_ardour/vca_time_axis.h
@@ -20,7 +20,9 @@
 #ifndef __ardour_vca_time_axis_h__
 #define __ardour_vca_time_axis_h__
 
-#include "ardour_button.h"
+#include "widgets/ardour_button.h"
+
+#include "stripable_colorpicker.h"
 #include "stripable_time_axis.h"
 #include "gain_meter.h"
 
@@ -35,7 +37,7 @@ namespace ARDOUR {
 
 class VCATimeAxisView : public StripableTimeAxisView
 {
-  public:
+public:
        VCATimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas);
        virtual ~VCATimeAxisView ();
 
@@ -51,19 +53,18 @@ class VCATimeAxisView : public StripableTimeAxisView
 
        void set_height (uint32_t h, TrackHeightMode m = OnlySelf);
 
-       bool selectable() const { return false; }
        bool marked_for_display () const;
        bool set_marked_for_display (bool);
 
- protected:
+protected:
        boost::shared_ptr<ARDOUR::VCA> _vca;
-       ArdourButton  solo_button;
-       ArdourButton  mute_button;
-       ArdourButton  automation_button;
-       ArdourButton  drop_button;
-       ArdourButton  number_label;
-       GainMeterBase gain_meter;
-       PBD::ScopedConnectionList vca_connections;
+       ArdourWidgets::ArdourButton    solo_button;
+       ArdourWidgets::ArdourButton    mute_button;
+       ArdourWidgets::ArdourButton    automation_button;
+       ArdourWidgets::ArdourButton    drop_button;
+       ArdourWidgets::ArdourButton    number_label;
+       GainMeterBase                  gain_meter;
+       PBD::ScopedConnectionList      vca_connections;
 
        void create_gain_automation_child (const Evoral::Parameter &, bool);
        void create_trim_automation_child (const Evoral::Parameter &, bool) {}
@@ -75,8 +76,11 @@ class VCATimeAxisView : public StripableTimeAxisView
 
        void create_automation_child (const Evoral::Parameter& param, bool show);
        virtual void build_automation_action_menu (bool);
+       void         build_display_menu ();
        Gtk::Menu* automation_action_menu;
 
+       bool name_entry_changed (std::string const&);
+
        void parameter_changed (std::string const& p);
        void vca_property_changed (PBD::PropertyChange const&);
        void update_vca_name ();
@@ -89,6 +93,12 @@ class VCATimeAxisView : public StripableTimeAxisView
        bool automation_click (GdkEventButton*);
        bool drop_release (GdkEventButton*);
        void self_delete ();
+
+       void drop_all_slaves ();
+       void choose_color ();
+
+private:
+       StripableColorDialog _color_picker;
 };
 
 #endif /* __ardour_vca_time_axis_h__ */