[Antiright-devel] antiright/src ACE

[Jeffrey Bedard]

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

Modified files:
        src            : ACE 

Log message:
        The play/next button causes the mpg123 output to be appended to 
~/.antiright_mp3s, rather than having it replace the file.  This prevents 
inaccurate display caused by truncating the file.

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

Patches:
Index: antiright/src/ACE
diff -u antiright/src/ACE:1.34 antiright/src/ACE:1.35
--- antiright/src/ACE:1.34      Wed Dec 29 02:33:47 2004
+++ antiright/src/ACE   Wed Dec 29 03:22:04 2004
@@ -283,6 +283,7 @@
 KillJuke()
 {
     kill $(ps xa | grep JUKE | grep -v grep | awk '{print $1}')
+    kill $(ps xa | grep tail | grep ~/.antiright_mp3s | grep -v grep | awk 
'{print $1}')
 }
 Juke_Song()
 {
@@ -295,6 +296,10 @@
        echo '^alias amp {exec -o ACE -A Juke_Song}' >> ~/.bitchxrc
        echo '^alias amn {exec -o killall -SIGINT mpg123}' >> ~/.bitchxrc
 }
+create_fake_song_file()
+{
+       echo 'Playing MPEG stream from http://www.nongnu.org/antiright mp3' > 
~/.antiright_mp3s
+}
 Juke()
 {
        if [ ! -f ~/.antiright_bitchx_done ]; then
@@ -304,11 +309,10 @@
        fi
        local mp3player="$(ACE -r mp3_player)"
        local mp3dir="$(ACE -r mp3_dir)"
-       local stop_play="killall $mp3player; rm -f ~/.antiright_mp3s"
-       local play_next="killall $mp3player; $mp3player -Z $mp3dir/*.mp3 2> 
~/.antiright_mp3s"
+       local stop_play="killall $mp3player; rm -f ~/.antiright_mp3s; ACE -A 
create_fake_song_file"
+       local play_next="killall $mp3player; $mp3player -Z $mp3dir/*.mp3 2>> 
~/.antiright_mp3s"
        local killjukebox="ACE -A KillJuke"
-       rm -f ~/.antiright_mp3s
-       touch ~/.antiright_mp3s
+       create_fake_song_file
        $ARSHELL -W JUKE\
        -Ai "$killjukebox" $bmdir/antiright/close.xbm\
        -Ai "$stop_play" $bmdir/antiright/stop.xbm\