X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvca_master_strip.h;h=0694b15e230c65ee20d7ab3eb53e870df628cfbf;hb=3d15499cdacacbafa32c8fcfb1389e6f0716ce9c;hp=7d1edf1acd44b2e988a56d74a87f077a5f9eb163;hpb=212afd402c98e71e3ccc6ce3c8795234aef66f54;p=ardour.git

diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h
index 7d1edf1acd..0694b15e23 100644
--- 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;
@@ -42,6 +44,9 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
 	VCAMasterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::VCA>);
 	~VCAMasterStrip ();
 
+	boost::shared_ptr<ARDOUR::Stripable> stripable() const;
+	ARDOUR::PresentationInfo const & presentation_info () const;
+
 	std::string name() const;
 	Gdk::Color color () const;
 	std::string state_id() const;
@@ -49,6 +54,8 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
 
 	static PBD::Signal1<void,VCAMasterStrip*> CatchDeletion;
 
+	bool marked_for_display () const;
+	bool set_marked_for_display (bool);
 
      private:
 	boost::shared_ptr<ARDOUR::VCA> _vca;
@@ -65,7 +72,6 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
 	ArdourButton number_label;
 	ArdourButton solo_button;
 	ArdourButton mute_button;
-	ArdourButton drop_button;
 	Gtk::Menu*   context_menu;
 	Gtk::MessageDialog* delete_dialog;
 	ArdourButton vertical_button;
@@ -73,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);
@@ -87,20 +93,23 @@ 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 ();
 	void hide_confirmation (int);
 	void self_delete ();
 	void remove ();
-	void drop_button_press ();
 	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;
 };