X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_ui.h;h=0501c78937406c80721aadc299c37de2cedb716c;hb=f7a27e17dbfe26c06702755f88336724b92ff617;hp=6601bb7d5dec815a801abfba6f5c18283c3701fc;hpb=592bfa3616678838bb80b925d66fbadae2d20d7e;p=ardour.git

diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 6601bb7d5d..0501c78937 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -36,6 +36,7 @@
 #include "ardour/track.h"
 
 #include "axis_view.h"
+#include "selectable.h"
 
 namespace ARDOUR {
 	class AudioTrack;
@@ -70,6 +71,7 @@ class RouteUI : public virtual AxisView
 	bool has_audio_outputs () const;
 
 	boost::shared_ptr<ARDOUR::Route> route() const { return _route; }
+	ARDOUR::RouteGroup* route_group() const;
 
 	boost::shared_ptr<ARDOUR::Track>      track() const;
 	boost::shared_ptr<ARDOUR::AudioTrack> audio_track() const;
@@ -93,28 +95,23 @@ class RouteUI : public virtual AxisView
 
 	Gtk::HBox _invert_button_box;
 	ArdourButton* mute_button;
-	BindableToggleButton* solo_button;
-	BindableToggleButton* rec_enable_button; /* audio tracks */
+	ArdourButton* solo_button;
+	ArdourButton* rec_enable_button; /* audio tracks */
 	ArdourButton* show_sends_button; /* busses */
 	ArdourButton* monitor_input_button;
 	ArdourButton* monitor_disk_button;
 
-	Gtk::Image* solo_safe_image;
+	Glib::RefPtr<Gdk::Pixbuf> solo_safe_pixbuf;
 
         ArdourButton* solo_safe_led;
         ArdourButton* solo_isolated_led;
 
-	Gtk::Label solo_button_label;
-	Gtk::Label rec_enable_button_label;
 	Gtk::Label monitor_input_button_label;
 	Gtk::Label monitor_disk_button_label;
 
 	void send_blink (bool);
 	sigc::connection send_blink_connection;
 
-	virtual std::string solo_button_name () const { return "SoloButton"; }
-	virtual std::string safe_solo_button_name () const { return "SafeSoloButton"; }
-
 	Gtk::Menu* mute_menu;
 	Gtk::Menu* solo_menu;
 	Gtk::Menu* sends_menu;
@@ -219,12 +216,17 @@ class RouteUI : public virtual AxisView
 	void save_as_template ();
 	void open_remote_control_id_dialog ();
 
-	static int solo_visual_state (boost::shared_ptr<ARDOUR::Route>);
-	static int solo_visual_state_with_isolate (boost::shared_ptr<ARDOUR::Route>);
-	static int solo_isolate_visual_state (boost::shared_ptr<ARDOUR::Route>);
-	static int solo_safe_visual_state (boost::shared_ptr<ARDOUR::Route>);
+	static Gtkmm2ext::ActiveState solo_active_state (boost::shared_ptr<ARDOUR::Route>);
+	static Gtkmm2ext::ActiveState solo_isolate_active_state (boost::shared_ptr<ARDOUR::Route>);
+	static Gtkmm2ext::ActiveState solo_safe_active_state (boost::shared_ptr<ARDOUR::Route>);
 	static Gtkmm2ext::ActiveState mute_active_state (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>);
 
+	/** Emitted when a bus has been set or unset from `display sends to this bus' mode
+	 *  by a click on the `Sends' button.  The parameter is the route that the sends are
+	 *  to, or 0 if no route is now in this mode.
+	 */
+	static sigc::signal<void, boost::shared_ptr<ARDOUR::Route> > BusSendDisplayChanged;
+
    protected:
 	PBD::ScopedConnectionList route_connections;
 	bool self_destruct;
@@ -242,6 +244,8 @@ class RouteUI : public virtual AxisView
 	void route_gui_changed (std::string);
 	virtual void route_color_changed () {}
 
+	virtual void bus_send_display_changed (boost::shared_ptr<ARDOUR::Route>);
+
   private:
 	void check_rec_enable_sensitivity ();
 	void parameter_changed (std::string const &);
@@ -267,14 +271,17 @@ class RouteUI : public virtual AxisView
 
 	void setup_invert_buttons ();
 	void set_invert_button_state ();
-	void invert_toggled (uint32_t, BindableToggleButton *);
 	void invert_menu_toggled (uint32_t);
 	bool invert_press (GdkEventButton *);
+	bool invert_release (GdkEventButton *, uint32_t i);
 
 	int _i_am_the_modifier;
-	std::list<BindableToggleButton*> _invert_buttons;
+	std::vector<ArdourButton*> _invert_buttons;
 	Gtk::Menu* _invert_menu;
 
+	static void set_showing_sends_to (boost::shared_ptr<ARDOUR::Route>);
+	static boost::weak_ptr<ARDOUR::Route> _showing_sends_to;
+	
 	static uint32_t _max_invert_buttons;
 };