[Antiright-devel] antiright/ACE-desktop/hacks juke.sh

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/10/21 01:24:01

Modified files:
        ACE-desktop/hacks: juke.sh 

Log message:
        Split control applet into separate function.
        Use control applet if osd_cat is installed on default invocation.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/hacks/juke.sh?cvsroot=antiright&r1=1.7&r2=1.8

Patches:
Index: juke.sh
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/hacks/juke.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- juke.sh     21 Oct 2007 01:22:10 -0000      1.7
+++ juke.sh     21 Oct 2007 01:24:01 -0000      1.8
@@ -48,19 +48,22 @@
        exit 0
 }
 
-
-
-song_applet() {
-       if [ "$1" = "--split" ]; then
-               nice -n 20 gtkshell -or 1 -oT JUKE_APPLET\
-                       -og '0+0' -on -oi menu\
-                       -aul 'ACE -A Hack juke -t' &
+control_applet()
+{
                nice -n 20 gtkshell -or 1 -oT JUKE_APPLET\
                        -og '-0+0' -on -oi menu \
                        'ACE -A Hack juke -s; ACE -A Hack juke ,gtk-media-play'\
                        'ACE -A Hack juke -n ,gtk-media-next'\
                        'ACE -A Hack juke -s ,gtk-media-stop'\
                        'ACE -A Hack juke -k ,gtk-close' &
+}
+
+song_applet() {
+       if [ "$1" = "--split" ]; then
+               control_applet
+               nice -n 20 gtkshell -or 1 -oT JUKE_APPLET\
+                       -og '0+0' -on -oi menu\
+                       -aul 'ACE -A Hack juke -t' &
        else
                nice -n 20 gtkshell -or 1 -oT JUKE_APPLET\
                        -og '0+0' -on -oL\
@@ -93,6 +96,8 @@
                if [ "$(pgrep -f JUKE_APPLET)" = "" ]; then
                        song_applet &
                fi
+       else
+               control_applet
        fi
        trap next_song 2
        trap stop_playing 3