From 230a701e934098076e935c466901e08df1e31e64 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Sep 2014 17:34:20 -0400
Subject: [PATCH] make global solo button blink to indicate something-soloed.

Color choices in icons/global_solo_button_active.png need "artist"
attention especially since "SOLO" text is pre-rendered.
---
 gtk2_ardour/editor.cc                         |  22 ++++++++++++++++++
 gtk2_ardour/editor.h                          |   3 +++
 .../icons/global_solo_button_active.png       | Bin 0 -> 603 bytes
 gtk2_ardour/ui/editor_window.xml              |   2 +-
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 gtk2_ardour/icons/global_solo_button_active.png

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index e545a5406c..e2bfa99c27 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -271,6 +271,8 @@ Editor::Editor ()
 	, skip_button (get_waves_button ("skip_button"))
         , global_tracks_button (get_waves_button ("global_tracks_button"))
         , add_marker_button (get_waves_button ("add_marker_button"))
+        , global_solo_button (get_waves_button ("global_solo_button"))
+        , global_rec_button (get_waves_button ("global_rec_button"))
 	, _tool_marker_button (get_waves_button ("tool_marker_button"))
 	, _tool_arrow_button (get_waves_button ("tool_arrow_button"))
 	, _tool_zoom_button (get_waves_button ("tool_zoom_button"))
@@ -645,6 +647,8 @@ Editor::Editor ()
 
 	setup_toolbar ();
 
+        ARDOUR_UI::Blink.connect (sigc::mem_fun(*this, &Editor::solo_blink));
+
 	set_zoom_focus (zoom_focus);
 	set_visible_track_count (_visible_track_count);
 	_snap_type = SnapToBeat;
@@ -5654,3 +5658,21 @@ Editor::ui_parameter_changed (string parameter)
 		}
 	}
 }
+
+void
+Editor::solo_blink (bool onoff)
+{
+	if (_session == 0) {
+		return;
+	}
+
+	if (_session->soloing() || _session->listening()) {
+		if (onoff) {
+			global_solo_button.set_active (true);
+		} else {
+			global_solo_button.set_active (false);
+		}
+	} else {
+		global_solo_button.set_active (false);
+	}
+}
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index b1ccb2e8d9..59c4e066f1 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1623,6 +1623,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	Gtk::Label               toolbar_selection_cursor_label;
 
         WavesButton& add_marker_button;
+        WavesButton& global_solo_button;
+        void solo_blink (bool);
+        WavesButton& global_rec_button;
 
 	Gtkmm2ext::TearOff*      _mouse_mode_tearoff;
 	WavesButton& _tool_marker_button;
diff --git a/gtk2_ardour/icons/global_solo_button_active.png b/gtk2_ardour/icons/global_solo_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..ced889cb37688648e79785afd08d9889ed13b5f7
GIT binary patch
literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq001fg000;W1^@s6jB#)M00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-vq3l$#=ew2g)0000TX;fHrLvL+uWo~o;00000Lvm$d
zbY)~9cWHEJAV*0}P-HG;2LJ#8(Md!>R7l6|mcMJ;Kp2J}w}lwd$r7C^Z(g#bT3R7(
zt-u|ENIGe7Ah>iB)X>d;Kn6ie3Wg3IYG|RNg}RswF=+8%k)a^)5DeL*PN|h8u76DJ
zCZfinrg$;vosPSgm*>0t?zr6h*`wdAfo`!T%0M&F3^W5>phCCK{>BOW8z($D|3ZAc
z3Bb5nVf*qZSu1qwOXqA~9x-lKRtsvHCXVCKnyZ9ih$=k?pjxfs`#!C?isLwFnnu1|
zBj2u3`u;kVF>Y2c41-3aL2It!c^<ZHCq=IWbTXMFWB<no;y9+ztrJBN7v%#0?!Ekq
z@B1i<vM@u}bv)1G?u(BA%yth6f`C$PXLX>TZ$C!Yb+%65q21qOI2-~n8jVuEFbokz
zabboa2&sYrqA0r2|F`b^%Mc%LQp)XcR(=J*&u<T~?Kkv#JtRru?25NoEHa%=Z#)%2
z5SU$=lV$l@vH!iJ;?q+M!$=xm{Phq)5Eu*w$g-SVp!2uS&@_#HzrQdi2!d2jzFk96
z6b6$|OM&K=`8|!B6)ej_k|Y3J*JZYQcx}GZ>2Og#Am6TGSyn2eHCHKg>zJmQw2kY!
pNzbkXG<)zf&<r#K%|O>5^bcL5unG|vuap1)002ovPDHLkV1nQZ{pJ7w

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index 2e5238219c..7af2358b40 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -383,7 +383,7 @@
                               height="24"
                               width="42"
                               normalicon="global_solo_button"
-                              activeicon="global_solo_button"/>
+                              activeicon="global_solo_button_active"/>
                 </HBox>
 		<EventBox id="master_bus_ui_home"
                           x="0"