X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.h;h=bd3c3a289b6b3cc3093be06c8eab95b8c1482db8;hb=dcf4d7b38a5d9e0db31924912180edd6c922ca34;hp=f9d745fe2b9d503c2702983fe501a395cbcdd39a;hpb=5424119b559fc6f68ca0d85c22a4866739c2ab73;p=ardour.git

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index f9d745fe2b..bd3c3a289b 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -69,7 +69,6 @@ namespace Gtk {
 }
 
 class Mixer_UI;
-class IOSelectorWindow;
 class MotionController;
 class RouteGroupMenu;
 class ArdourWindow;
@@ -126,16 +125,21 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void cut_processors ();
 	void paste_processors ();
 	void select_all_processors ();
-	void delete_processors ();
+	void deselect_all_processors ();
+	bool delete_processors ();  //note: returns false if nothing was deleted
 	void toggle_processors ();
 	void ab_plugins ();
 
+	void set_selected(bool yn);
+	bool is_selected() {return _selected;}
+
+	static MixerStrip* entered_mixer_strip() { return _entered_mixer_strip; }
+
   protected:
 	friend class Mixer_UI;
 	void set_packed (bool yn);
 	bool packed () { return _packed; }
 
-	void set_selected(bool yn);
 	void set_stuff_from_route ();
 
   private:
@@ -153,8 +157,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	ArdourButton         width_button;
 	ArdourButton         number_label;
 	Gtk::HBox           width_hide_box;
-	Gtk::VBox           whvbox;
-	Gtk::EventBox       top_event_box;
 	Gtk::EventBox*      spacer;
 
 	void hide_clicked();
@@ -169,7 +171,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
 	Glib::RefPtr<Gtk::SizeGroup> button_size_group;
 
-	Gtk::Table button_table;
 	Gtk::Table rec_mon_table;
 	Gtk::Table solo_iso_table;
 	Gtk::Table mute_solo_table;
@@ -196,21 +197,18 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
 	ArdourButton   name_button;
 
-	ArdourWindow*  comment_window;
-	Gtk::TextView* comment_area;
 	ArdourButton   _comment_button;
 
-	void comment_editor_done_editing ();
-	void setup_comment_editor ();
-	void open_comment_editor ();
-	void toggle_comment_editor ();
 	void setup_comment_button ();
 
 	ArdourButton   group_button;
 	RouteGroupMenu *group_menu;
 
 	gint input_press (GdkEventButton *);
+	gint input_release (GdkEventButton *);
+
 	gint output_press (GdkEventButton *);
+	gint output_release (GdkEventButton *);
 
 	Gtk::Menu input_menu;
 	std::list<boost::shared_ptr<ARDOUR::Bundle> > input_menu_bundles;
@@ -223,9 +221,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	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 ();
-
 	void diskstream_changed ();
 	void io_changed_proxy ();
 
@@ -250,19 +245,13 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	Gtk::Menu* route_ops_menu;
 	void build_route_ops_menu ();
 	gboolean name_button_button_press (GdkEventButton*);
+	gboolean name_button_button_release (GdkEventButton*);
+	gboolean number_button_button_press (GdkEventButton*);
 	void list_route_operations ();
 
-	gint comment_key_release_handler (GdkEventKey*);
-	void comment_changed (void *src);
-	void comment_edited ();
-	bool ignore_comment_edit;
-
 	bool select_route_group (GdkEventButton *);
 	void route_group_changed ();
 
-	IOSelectorWindow *input_selector;
-	IOSelectorWindow *output_selector;
-
 	Gtk::Style *passthru_style;
 
 	void route_color_changed ();
@@ -278,29 +267,31 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
 	bool ignore_speed_adjustment;
 
+	static MixerStrip* _entered_mixer_strip;
+
 	void engine_running();
 	void engine_stopped();
 
 	virtual void bus_send_display_changed (boost::shared_ptr<ARDOUR::Route>);
 
 	void set_current_delivery (boost::shared_ptr<ARDOUR::Delivery>);
-	boost::shared_ptr<ARDOUR::Delivery> _current_delivery;
 
 	void drop_send ();
 	PBD::ScopedConnection send_gone_connection;
 
 	void reset_strip_style ();
 
-	static int scrollbar_height;
-
 	void update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width width, bool input_button);
 	void port_connected_or_disconnected (boost::weak_ptr<ARDOUR::Port>, boost::weak_ptr<ARDOUR::Port>);
 
+	bool mixer_strip_enter_event ( GdkEventCrossing * );
+	bool mixer_strip_leave_event ( GdkEventCrossing * );
+
 	/** A VisibilityGroup to manage the visibility of some of our controls.
 	 *  We fill it with the controls that are being managed, using the same names
 	 *  as those used with _mixer_strip_visibility in RCOptionEditor.  Then
 	 *  this VisibilityGroup is configured by changes to the RC variable
-	 *  mixer-strip-visibility, which happen when the user makes changes in
+	 *  mixer-element-visibility, which happen when the user makes changes in
 	 *  the RC option editor.
 	 */
 	VisibilityGroup _visibility;