X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.h;h=15948768a13a707ef8fde54b1f1404c5d6f57261;hb=65eeeb7a652d7022783b10e35941ce56e0fc7207;hp=897ae7d1b740a72a3bde4001a6ccc20015b7f3b7;hpb=0275582b8980e96eb70e153b4bf4df5b4a4bce5e;p=ardour.git

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 897ae7d1b7..15948768a1 100644
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -98,6 +98,14 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 	 */
 	PBD::Signal1<bool, GdkEventButton *> LevelMeterButtonPress;
 
+	static std::string astate_string (ARDOUR::AutoState);
+	static std::string short_astate_string (ARDOUR::AutoState);
+	static std::string _astate_string (ARDOUR::AutoState, bool);
+
+	static std::string astyle_string (ARDOUR::AutoStyle);
+	static std::string short_astyle_string (ARDOUR::AutoStyle);
+	static std::string _astyle_string (ARDOUR::AutoStyle, bool);
+
   protected:
 
 	friend class MixerStrip;
@@ -131,6 +139,10 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 	Gtk::Menu gain_astate_menu;
 	Gtk::Menu gain_astyle_menu;
 
+	void set_gain_astate (ARDOUR::AutoState);
+	bool gain_astate_propagate;
+	static sigc::signal<void, ARDOUR::AutoState> ChangeGainAutomationState;
+
 	gint gain_automation_style_button_event (GdkEventButton *);
 	gint gain_automation_state_button_event (GdkEventButton *);
 	gint pan_automation_style_button_event (GdkEventButton *);
@@ -140,15 +152,6 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 	void gain_automation_style_changed();
 
 	void setup_gain_adjustment ();
-
-	std::string astate_string (ARDOUR::AutoState);
-	std::string short_astate_string (ARDOUR::AutoState);
-	std::string _astate_string (ARDOUR::AutoState, bool);
-
-	std::string astyle_string (ARDOUR::AutoStyle);
-	std::string short_astyle_string (ARDOUR::AutoStyle);
-	std::string _astyle_string (ARDOUR::AutoStyle, bool);
-
 	Width _width;
 
 	void show_gain ();
@@ -232,7 +235,7 @@ class GainMeter : public GainMeterBase, public Gtk::VBox
 
 	Gtk::HBox  gain_display_box;
 	Gtk::HBox  fader_box;
-	Gtk::VBox* fader_vbox;
+	Gtk::VBox  fader_vbox;
 	Gtk::HBox  hbox;
 	Gtk::HBox  meter_hbox;
 	Gtk::Alignment fader_alignment;