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

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/07/22 16:22:28

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

Log message:
        Split applet into two windows, to fix resizing issues on song title
        display.  Use small icons on control panel.  Add close button.
        Fix song title query function.  Added option to kill song applet.

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

Patches:
Index: juke.sh
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/hacks/juke.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- juke.sh     22 Jul 2007 08:15:17 -0000      1.1
+++ juke.sh     22 Jul 2007 16:22:28 -0000      1.2
@@ -15,17 +15,30 @@
 }
 
 song_title() {
-       ps xaww | awk -v '/'$MP3_PLAYER'/ && !/xargs/ {\
-               print substr($0, index($0, $6))}'
+       ps xaww | grep -v xargs | grep $MP3_PLAYER | grep -v '(sh)'\
+               | awk '{print substr($0, index($0, $6)); 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' &
+               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' &
+       else
        nice -n 20 gtkshell -or 1 -oT JUKE_APPLET\
                -og '0+0' -on -oL\
-               -aul 'juke.sh -t' -ol\
-               'juke.sh -s ; juke.sh ,gtk-media-play'\
-               'juke.sh -n ,gtk-media-next'\
-               'juke.sh -s ,gtk-media-stop'
+                       -aul 'ACE -A Hack juke -t' -ol\
+                       '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' &
+       fi
 }
 
 random_song() {
@@ -36,6 +49,8 @@
 {
        echo 'USAGE:'
        echo '*         song applet'
+       echo '-h        show usage'
+       echo '-k        kill applet'
        echo '-n        next song'
        echo '-r        random song'
        echo '-s        stop playing'
@@ -43,17 +58,19 @@
 }
 
 if [ "$1" = "" ]; then
-       if [ "$(pgrep JUKE_APPLET)" = "" ]; then
+       if [ "$(pgrep -f JUKE_APPLET)" = "" ]; then
                song_applet &
        fi
        trap next_song 2
        trap stop_playing 3
        while :; do
                random_song
-               sleep 0.125
+               sleep 0.25
        done
 elif [ "$1" = "-h" ]; then
        show_usage
+elif [ "$1" = "-k" ]; then
+       pkill -f JUKE_APPLET
 elif [ "$1" = "-n" ]; then
        next_song
 elif [ "$1" = "-r" ]; then
@@ -63,6 +80,6 @@
 elif [ "$1" = "-t" ]; then
        song_title
 else
-       song_applet
+       song_applet --split
 fi