[Antiright-devel] antiright ./Makefile.in ./configure src/ACE

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 04/12/27 07:55:26

Modified files:
        .              : Makefile.in configure 
        src            : ACE 

Log message:
        Added support for the mpg script from BitchX's bain.irc package in the 
Jukebox.
        This allows the current song to be displayed in a bitchx session with 
the /mp3 command.

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

Patches:
Index: antiright/Makefile.in
diff -u antiright/Makefile.in:1.32 antiright/Makefile.in:1.33
--- antiright/Makefile.in:1.32  Wed Dec 22 02:39:38 2004
+++ antiright/Makefile.in       Mon Dec 27 07:55:26 2004
@@ -43,7 +43,8 @@
        src/arshell/color.o src/arshell/dialog.o src/arshell/menubar.o\
        src/arshell/update.o src/arshell/layout.o src/arshell/main.o\
        src/arshell/search.o src/arshell/file.o src/arshell/interface_file.o\
-       src/arshell/pixmap.o src/arshell/clockload.o $(lib-objects)
+       src/arshell/pixmap.o src/arshell/clockload.o src/arshell/appendage.o\
+       $(lib-objects)
 arshell:$(arshell-objects)
        $(CC) $(arshell-objects) $(CFLAGS) $(LIBDIR) $(LIBS) -o arshell
 
Index: antiright/configure
diff -u antiright/configure:1.48 antiright/configure:1.49
--- antiright/configure:1.48    Sun Dec 19 17:15:25 2004
+++ antiright/configure Mon Dec 27 07:55:26 2004
@@ -24,7 +24,7 @@
 #
 ###############################################################################
 
-VERSION=2.5
+VERSION=2.6
 DEFS="$DEFS -DPACKAGE_STRING='\"AntiRight_$VERSION\"'"
 
 ICONDIR=/usr/X11R6/include/X11/bitmaps/antiright
Index: antiright/src/ACE
diff -u antiright/src/ACE:1.31 antiright/src/ACE:1.32
--- antiright/src/ACE:1.31      Sat Dec 25 21:10:18 2004
+++ antiright/src/ACE   Mon Dec 27 07:55:26 2004
@@ -287,11 +287,32 @@
 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 "ACE -A KillJuke" $bmdir/antiright/close.xbm\
-       -Ai "killall $mp3player \# Stop" $bmdir/antiright/stop.xbm\
-       -Ai "killall $mp3player; $mp3player -Z $mp3dir/*.mp3 \# Play/Next"\
+       -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"
 }