X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.h;h=fe10070fbb6397d2be554415b41fd0c02b457ba5;hb=8cd71108c1d153f84f25c3b9e5153a110826c130;hp=6ef282e6979600f5348f02406897a0dc15d007ae;hpb=e5dd712ac42c8a8a7367cd6e0b06c530ca990c75;p=ardour.git

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 6ef282e697..fe10070fbb 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -149,8 +149,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	Width _width;
 	void*  _width_owner;
 
-	Gtk::Button         hide_button;
-	Gtk::Button         width_button;
+	ArdourButton         hide_button;
+	ArdourButton         width_button;
 	Gtk::HBox           width_hide_box;
 	Gtk::VBox           whvbox;
 	Gtk::EventBox       top_event_box;
@@ -174,22 +174,15 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	Gtk::Table middle_button_table;
 	Gtk::Table bottom_button_table;
 
-	Gtk::Button                  gain_unit_button;
-	Gtk::Label                   gain_unit_label;
-	Gtk::Button                  meter_point_button;
-	Gtk::Label                   meter_point_label;
+	ArdourButton                 meter_point_button;
 
 	void meter_changed ();
 
-	Gtk::Button diskstream_button;
-	Gtk::Label  diskstream_label;
+	ArdourButton input_button;
+	ArdourButton output_button;
 
-	Gtk::Button input_button;
-	Gtkmm2ext::StatefulToggleButton* midi_input_enable_button;
+	ArdourButton* midi_input_enable_button;
 	Gtk::HBox   input_button_box;
-	Gtk::Label  input_label;
-	Gtk::Button output_button;
-	Gtk::Label  output_label;
 
 	std::string longest_label;
 
@@ -200,11 +193,11 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	gint    mark_update_safe ();
 	guint32 mode_switch_in_progress;
 
-	Gtk::Button   name_button;
+	ArdourButton   name_button;
 
 	ArdourWindow*  comment_window;
 	Gtk::TextView* comment_area;
-	Gtk::Button   _comment_button;
+	ArdourButton   _comment_button;
 
 	void comment_editor_done_editing ();
 	void setup_comment_editor ();
@@ -212,8 +205,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void toggle_comment_editor ();
 	void setup_comment_button ();
 
-	Gtk::Button   group_button;
-	Gtk::Label    group_label;
+	ArdourButton   group_button;
 	RouteGroupMenu *group_menu;
 
 	gint input_press (GdkEventButton *);
@@ -227,8 +219,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	std::list<boost::shared_ptr<ARDOUR::Bundle> > output_menu_bundles;
 	void maybe_add_bundle_to_output_menu (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::BundleList const &);
 
-	void bundle_input_toggled (boost::shared_ptr<ARDOUR::Bundle>);
-	void bundle_output_toggled (boost::shared_ptr<ARDOUR::Bundle>);
+	void bundle_input_chosen (boost::shared_ptr<ARDOUR::Bundle>);
+	void bundle_output_chosen (boost::shared_ptr<ARDOUR::Bundle>);
 
 	void edit_input_configuration ();
 	void edit_output_configuration ();
@@ -273,6 +265,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void route_color_changed ();
 	void show_passthru_color ();
 
+	void property_changed (const PBD::PropertyChange&);
+	void name_button_resized (Gtk::Allocation&);
 	void name_changed ();
 	void update_speed_display ();
 	void map_frozen ();
@@ -314,13 +308,16 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void add_input_port (ARDOUR::DataType);
 	void add_output_port (ARDOUR::DataType);
 
+	bool _suspend_menu_callbacks;
 	bool level_meter_button_press (GdkEventButton *);
 	void popup_level_meter_menu (GdkEventButton *);
-	void add_level_meter_item (Gtk::Menu_Helpers::MenuList &, Gtk::RadioMenuItem::Group &, std::string const &, ARDOUR::MeterPoint);
+	void add_level_meter_item_point (Gtk::Menu_Helpers::MenuList &, Gtk::RadioMenuItem::Group &, std::string const &, ARDOUR::MeterPoint);
+	void add_level_meter_item_type (Gtk::Menu_Helpers::MenuList &, Gtk::RadioMenuItem::Group &, std::string const &, ARDOUR::MeterType);
 	void set_meter_point (ARDOUR::MeterPoint);
+	void set_meter_type (ARDOUR::MeterType);
 	PBD::ScopedConnection _level_meter_connection;
 
-	static std::string meter_point_string (ARDOUR::MeterPoint);
+	std::string meter_point_string (ARDOUR::MeterPoint);
 };
 
 #endif /* __ardour_mixer_strip__ */