X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvca_master_strip.h;h=ea8ee52f6d4a95480cd0026199dc8c3cba1c8929;hb=540827880248eb8ae7fb39f466dbd94e4ce72cc8;hp=0c752cbeec676833ee155e26c2b543af7dd003d7;hpb=1d81392e379c96b4014b9cf2cb4d3349a0f4b9bf;p=ardour.git

diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h
index 0c752cbeec..ea8ee52f6d 100644
--- a/gtk2_ardour/vca_master_strip.h
+++ b/gtk2_ardour/vca_master_strip.h
@@ -26,6 +26,7 @@
 
 #include "ardour_button.h"
 #include "axis_view.h"
+#include "control_slave_ui.h"
 #include "gain_meter.h"
 
 namespace ARDOUR {
@@ -41,22 +42,27 @@ 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;
-	std::string state_id() const { return "VCAMasterStrip"; }
+	Gdk::Color color () const;
+	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;
-	ArdourButton name_button;
 	GainMeter    gain_meter;
 
 	Gtk::Frame   global_frame;
 	Gtk::VBox    global_vpacker;
 	Gtk::HBox    top_padding;
 	Gtk::HBox    bottom_padding;
-	Gtk::HBox    width_hide_box;
 	Gtk::HBox    solo_mute_box;
 	ArdourButton width_button;
 	ArdourButton color_button;
@@ -64,12 +70,15 @@ 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 hide_clicked();
 	bool width_button_pressed (GdkEventButton *);
 	void set_selected (bool);
@@ -79,19 +88,24 @@ 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);
-	bool name_button_press (GdkEventButton*);
-	bool vertical_box_press (GdkEventButton*);
+	void finish_name_edit (std::string, int);
+	bool vertical_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 parameter_changed (std::string const& p);
+	void set_button_names ();
+
+	void start_color_edit ();
+	void finish_color_edit (int, Gtk::ColorSelectionDialog*);
 };