X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvca_master_strip.h;h=0694b15e230c65ee20d7ab3eb53e870df628cfbf;hb=24d5f1a6249b08a8b21854ecf001be7e07e5bf23;hp=785f76deb957fd241eecc114941b6ab3507797fa;hpb=e574ab30e77450f845fb5a325dee08c38c25bf3e;p=ardour.git

diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h
index 785f76deb9..0694b15e23 100644
--- a/gtk2_ardour/vca_master_strip.h
+++ b/gtk2_ardour/vca_master_strip.h
@@ -23,10 +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;
@@ -41,13 +44,18 @@ 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 { return "VCAMasterStrip"; }
+	std::string state_id() const;
 	boost::shared_ptr<ARDOUR::VCA> vca() const { return _vca; }
 
 	static PBD::Signal1<void,VCAMasterStrip*> CatchDeletion;
 
+	bool marked_for_display () const;
+	bool set_marked_for_display (bool);
 
      private:
 	boost::shared_ptr<ARDOUR::VCA> _vca;
@@ -64,15 +72,14 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
 	ArdourButton number_label;
 	ArdourButton solo_button;
 	ArdourButton mute_button;
-	ArdourButton assign_button;
-	ArdourButton drop_button;
 	Gtk::Menu*   context_menu;
-	PBD::ScopedConnectionList vca_connections;
 	Gtk::MessageDialog* delete_dialog;
 	ArdourButton vertical_button;
+	ControlSlaveUI control_slave_ui;
+	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);
@@ -82,24 +89,27 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
 	void set_solo_text ();
 	void solo_changed ();
 	void mute_changed ();
-	void vca_menu_toggle (Gtk::CheckMenuItem* menuitem, uint32_t n);
 	void unassign ();
-	bool vca_button_release (GdkEventButton*);
-	void update_vca_display ();
 	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 ();
+	StripableColorDialog _color_picker;
 };