Tweak/fix splash screen event-loop

[ardour.git] / gtk2_ardour / vca_master_strip.h

diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h
index 7208071f85d2bcddea50ce8669d2a00d037469c2..0694b15e230c65ee20d7ab3eb53e870df628cfbf 100644 (file)
--- a/gtk2_ardour/vca_master_strip.h
+++ b/gtk2_ardour/vca_master_strip.h
@@ -23,11 +23,13 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/menuitem.h>
+#include <gtkmm/colorselection.h>
 
 #include "ardour_button.h"
 #include "axis_view.h"
 #include "control_slave_ui.h"
 #include "gain_meter.h"
+#include "stripable_colorpicker.h"
 
 namespace ARDOUR {
        class GainControl;
@@ -77,7 +79,7 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
        PBD::ScopedConnectionList vca_connections;
 
        void spill ();
-       void spill_change (boost::shared_ptr<ARDOUR::VCA>);
+       void spill_change (boost::shared_ptr<ARDOUR::Stripable>);
        void hide_clicked();
        bool width_button_pressed (GdkEventButton *);
        void set_selected (bool);
@@ -91,6 +93,7 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
        void start_name_edit ();
        void finish_name_edit (std::string, int);
        bool vertical_button_press (GdkEventButton*);
+       bool number_button_press (GdkEventButton*);
        void vca_property_changed (PBD::PropertyChange const & what_changed);
        void update_vca_name ();
        void build_context_menu ();
@@ -98,12 +101,15 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
        void self_delete ();
        void remove ();
        void drop_all_slaves ();
+       void assign_all_selected ();
+       void unassign_all_selected ();
 
        void parameter_changed (std::string const& p);
        void set_button_names ();
+       void update_bottom_padding ();
 
        void start_color_edit ();
-       void finish_color_edit (int, Gtk::ColorSelectionDialog*);
+       StripableColorDialog _color_picker;
 };