[Antiright-devel] antiright/src ACE

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 05/02/12 17:55:59

Modified files:
        src            : ACE 

Log message:
        Consolidated the desktop panel and the jukebox.

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

Patches:
Index: antiright/src/ACE
diff -u antiright/src/ACE:1.39 antiright/src/ACE:1.40
--- antiright/src/ACE:1.39      Sat Jan 29 11:44:50 2005
+++ antiright/src/ACE   Sat Feb 12 17:55:58 2005
@@ -76,7 +76,7 @@
     $ARSHELL -Am -r 6\
        -AL\
        -W 'ACE Panel'\
-       'ACE -A Jukebox'\
+       'ACE IRC'\
        'ACE Alarm'\
        'ACE Calculator'\
        'ACE CD_Player'\
@@ -94,6 +94,68 @@
        'ACE -A Settings'\
        'ACE Command'
 }
+
+Setup_Juke_Environment()
+{
+    if [ ! -f ~/.antiright_bitchx_done ]; then
+               touch ~/.antiright_bitchx_done
+               $ARSHELL -Al "Install AntiRight's BitchX aliases?" \
+               "ACE -A Install_BitchX \# Yes" "echo No" -E
+       fi
+       mp3player="$(ACE -r mp3_player)"
+       mp3dir="$(ACE -r mp3_dir)"
+       stop_play="killall $mp3player; rm -f ~/.antiright_mp3s;\
+ ACE -A create_fake_song_file"
+       play_next="killall $mp3player; $mp3player -Z $mp3dir/*.mp3\
+ 2>> ~/.antiright_mp3s"
+       killjukebox="ACE -A KillJuke"
+}
+
+create_fake_song_file()
+{
+       echo 'Playing MPEG stream from http://www.nongnu.org/antiright'\
+           > ~/.antiright_mp3s
+}
+
+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}') 1> /dev/null 2> /dev/null
+    rm -f ~/.antiright_mp3s
+    kill $(pidof mpg123) 1> /dev/null 2> /dev/null
+}
+
+Juke_Song()
+{
+    if [ ! -f ~/.antiright_mp3s ]; then
+       create_fake_song_file
+    fi
+    grep Playing ~/.antiright_mp3s | tail -n 1\
+       | cut -d ' ' -f 5- | tr ' ' '\n' | fgrep -v '...' | tr '\n' ' '\
+       | tr '.' '\n' | fgrep -v 'mp3' | fgrep -v 'wav' | fgrep -v 'ogg'\
+       | tr '\n' '.' | tr '_' ' '
+}
+
+Juke_Playing()
+{
+    echo Playing '-{' $(Juke_Song) '}-     '
+}
+
+Next_Song()
+{
+    killall -SIGINT mpg123 1> /dev/null 2> /dev/null
+    usleep 500000 1> /dev/null 2> /dev/null
+    Juke_Playing
+}
+
+Install_BitchX()
+{
+       echo '^alias amp {exec -o ACE -A Juke_Playing}' >> ~/.bitchxrc
+       echo '^alias amn {exec ACE -A Next_Song}' >> ~/.bitchxrc
+       echo '^alias amt {exec ACE -A Juke_Playing}' >> ~/.bitchxrc
+}
+
 killdesk()
 {
     kill $(ps xa | grep DESKTOP | awk '{print $1}' | tr '\n' ' ')\
@@ -102,21 +164,25 @@
 
 Desktop()
 {
+    Setup_Juke_Environment
+    create_fake_song_file
     arbmdir=$bmdir/antiright
-    $ARSHELL -W DESKTOP -Ac -r 4\
-       'ACE A.C.E.' 'ACE Lock'\
+    $ARSHELL -W DESKTOP -Ac\
+       -UL 'ACE -A Juke_Song'\
+       -r 4\
+       "$play_next \# Play" 'ACE Lock'\
        -Ai 'ACE Note' $arbmdir/knotes.xpm\
        -Ai 'ACE Calculator' $arbmdir/kcalc.xpm\
-       'vdesk 1' 'vdesk 2'\
+       "$stop_play \# Stop" 'ACE A.C.E.'\
        -Ai 'ACE File_Manager' $arbmdir/kfm.xpm\
        -Ai 'ACE -A File_System_Panel File_Systems' $arbmdir/fileserver.xpm\
-       'vdesk 3' 'vdesk 4'\
+       'vdesk 1' 'vdesk 2'\
        -Ai 'ACE Terminal' $arbmdir/term.xpm\
        -Ai 'ACE Load_Meter' $arbmdir/ksysguard.xpm\
-       'vdesk 5' 'vdesk 6'\
+       'vdesk 3' 'vdesk 4'\
        -Ai 'ACE Editor' $arbmdir/kedit.xpm\
        -Ai 'ACE Browser' $arbmdir/www.xpm\
-       'vdesk 7' 'vdesk 8'\
+       'vdesk 5' 'vdesk 6'\
        -Ai 'ACE Background' $arbmdir/kcoloredit.xpm\
        -Ai 'ACE Mail' $arbmdir/mail.xpm\
        'ACE Alarm' 'ACE Run' \
@@ -281,67 +347,7 @@
            "echo Exit"
     fi
 }
-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()
-{
-       echo Playing '-{' $(grep Playing ~/.antiright_mp3s | tail -n 1\
-           | cut -d ' ' -f 5- | tr ' ' '\n' | fgrep -v '...' | tr '\n' ' ')\
-           '}-'
-}
-Next_Song()
-{
-    killall -SIGINT mpg123
-    usleep 500000
-    Juke_Song
-}
-Install_BitchX()
-{
-       echo '^alias amp {exec -o ACE -A Juke_Song}' >> ~/.bitchxrc
-       echo '^alias amn {exec ACE -A Next_Song}' >> ~/.bitchxrc
-       echo '^alias amt {exec ACE -A Juke_Song}' >> ~/.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
-               touch ~/.antiright_bitchx_done
-               $ARSHELL -Al "Install AntiRight's BitchX aliases?" \
-               "ACE -A Install_BitchX \# Yes" "echo No" -E
-       fi
-       local mp3player="$(ACE -r mp3_player)"
-       local mp3dir="$(ACE -r mp3_dir)"
-       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"
-       create_fake_song_file
-       $ARSHELL -W JUKE\
-       -Ai "$killjukebox" $bmdir/antiright/close.xbm\
-       -Ai "$stop_play" $bmdir/antiright/stop.xbm\
-       -Ai "$play_next" $bmdir/antiright/play.xbm\
-       -geometry -0+0 -xrm "*overrideRedirect: True" &
-       tail -F ~/.antiright_mp3s
-       rm -f ~/.antiright_mp3s
-}
-Jukebox()
-{
-    xsetroot -solid darkgrey &
-    xterm -geometry 80x12-0+0\
-       -bg darkgrey -bd darkgrey\
-       -xrm "*overrideRedirect: True"\
-       -xrm ".xterm.vt100.background: darkgrey"\
-       -e ACE -A Juke &
-}
+
 Calculate()
 {
     local input="$($ARSHELL -W Calculate -ADp Calculate:)"