[Antiright-devel] antiright/src ACE

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 04/12/28 03:04:57

Modified files:
        src            : ACE 

Log message:
        Removed the bitchx features, as they added too many hacks.  Posting 
mp3s on chat isnt really necessary anyways.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/ACE.diff?tr1=1.32&tr2=1.33&r1=text&r2=text

Patches:
Index: antiright/src/ACE
diff -u antiright/src/ACE:1.32 antiright/src/ACE:1.33
--- antiright/src/ACE:1.32      Mon Dec 27 07:55:26 2004
+++ antiright/src/ACE   Tue Dec 28 03:04:53 2004
@@ -286,35 +286,16 @@
 }
 Juke()
 {
-    local mp3player="$(ACE -r mp3_player)"
-    if [ "$mp3player" = "mpg123" ]; then
-           # Test for the presence of the mpg script from BitchX's bain.irc.
-           if [ -f ~/bin/mpg ]; then
-               # Ensure that the script is from bain.irc.  
-               if grep Bain ~/bin/mpg; then
-                       mp3player="mpg"
-               fi
-           fi
-    fi
-    local mp3dir="$(ACE -r mp3_dir)"
-    rm -f $mp3dir/MYTEST
-    if [ "$mp3player" = "mpg" ]; then
-           rm -f $mp3dir/MYTEST
-           local stop="rm -f $mp3dir/MYTEST; killall mpg; killall tail; 
killall mpg123"
-           local play_next="if [ -f $mp3dir/MYTEST ]; then killall mpg123 
-SIGINT; else mpg; fi"
-           local killjukebox="ACE -A KillJuke; killall tail"
-    else
-           local stop="killall $mp3player"
-           local play_next="killall $mp3player; $mp3player -Z $mp3dir/*.mp3"
-           local killjukebox="ACE -A KillJuke"
-    fi
-    $stop
-    $ARSHELL -W JUKE\
-       -Ai "$killjukebox" $bmdir/antiright/close.xbm\
-       -Ai "$stop" $bmdir/antiright/stop.xbm\
-       -Ai "$stop; $play_next"\
-       $bmdir/antiright/play.xbm\
-        -geometry -0+0 -xrm "*overrideRedirect: True"
+       local mp3player="$(ACE -r mp3_player)"
+       local mp3dir="$(ACE -r mp3_dir)"
+       local stop_play="killall $mp3player"
+       local play_next="killall $mp3player; $mp3player -Z $mp3dir/*.mp3"
+       local killjukebox="ACE -A KillJuke"
+       $ARSHELL -W JUKE\
+       -Ai "$KillJuke" $bmdir/antiright/close.xbm\
+       -Ai "$stop_play" $bmdir/antiright/stop.xbm\
+       -Ai "$play_next" $bmdir/antiright/play.xbm\
+       -geometry -0+0 -xrm "*overrideRedirect: True" 
 }
 Jukebox()
 {