X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fmixer_strip.h;h=ef35bf237d9e49d4c2076d95bcd1151037e74372;hb=c78528dcea03a61685ad0586eaa6302847af6fe9;hp=0e587805ba8bf448ef8a2e1361cd1293ffd96778;hpb=cf1541c3086b376ecac1b70cafef058b4348ab96;p=ardour.git

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 0e587805ba..ef35bf237d 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -107,6 +107,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 		return _mixer_owned;
 	}
 
+	void hide_things ();
+
 	sigc::signal<void> WidthChanged;
 
 	/** The delivery that we are handling the level for with our fader has changed */
@@ -156,14 +158,16 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	ProcessorBox processor_box;
 	GainMeter   gpm;
 	PannerUI    panners;
-	BindableToggleButton _mono_button;
 
 	Gtk::Table button_table;
         Gtk::Table solo_led_table;
-        Gtk::HBox  solo_led_box;
+	Gtk::HBox  below_panner_box;
 	Gtk::Table middle_button_table;
 	Gtk::Table bottom_button_table;
 
+	Gtk::Label* _iso_label;
+	Gtk::Label* _safe_label;
+
 	Gtk::Button                  gain_unit_button;
 	Gtk::Label                   gain_unit_label;
 	Gtk::Button                  meter_point_button;
@@ -188,12 +192,10 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
 	ArdourDialog*  comment_window;
 	Gtk::TextView* comment_area;
-	Gtk::Button    comment_button;
 
-	void comment_editor_done_editing();
+	void comment_editor_done_editing ();
 	void setup_comment_editor ();
-	void comment_button_clicked ();
-	void mono_button_clicked ();
+	void toggle_comment ();
 
 	Gtk::Button   group_button;
 	Gtk::Label    group_label;
@@ -219,6 +221,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void diskstream_changed ();
 
 	Gtk::Menu *send_action_menu;
+	Gtk::CheckMenuItem* _comment_menu_item;
 	Gtk::MenuItem* rename_menu_item;
 	void build_send_action_menu ();
 
@@ -245,7 +248,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void comment_edited ();
 	bool ignore_comment_edit;
 
-	void set_route_group (ARDOUR::RouteGroup *);
 	bool select_route_group (GdkEventButton *);
 	void route_group_changed ();
 
@@ -258,8 +260,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void show_route_color ();
 	void show_passthru_color ();
 
-	void route_active_changed ();
-
 	void name_changed ();
 	void update_speed_display ();
 	void map_frozen ();
@@ -285,6 +285,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
 	void update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width width, bool input_button);
 	void port_connected_or_disconnected (ARDOUR::Port *, ARDOUR::Port *);
+
+        static std::string meter_point_string (ARDOUR::MeterPoint);
 };
 
 #endif /* __ardour_mixer_strip__ */