[Antiright-devel] antiright/src ACE

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 04/12/25 21:10:18

Modified files:
        src            : ACE 

Log message:
        XmCD is now used if available.

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

Patches:
Index: antiright/src/ACE
diff -u antiright/src/ACE:1.30 antiright/src/ACE:1.31
--- antiright/src/ACE:1.30      Wed Dec 22 21:47:51 2004
+++ antiright/src/ACE   Sat Dec 25 21:10:18 2004
@@ -245,7 +245,7 @@
 }
 Select_CD_Track()
 {
-    tracks=$(arcd -T)
+    local tracks=$(arcd -T)
     if [ $tracks -gt 0 ]; then
        track=$($ARSHELL -W 'Select Track' -ADp "Track: [1-$tracks]")
        track_after_zero="[ $track -gt 0 ]"
@@ -261,13 +261,24 @@
 }
 CD_Player()
 {
-    $ARSHELL -W 'CD Player' -r 2 -E \
-       'ACE -A CD_Player & ACE Play_CD'\
-       'ACE -A CD_Player & ACE Pause_CD'\
-       'ACE -A CD_Player & ACE Resume_CD'\
-       'ACE -A CD_Player & ACE Stop_CD'\
-       'ACE -A CD_Player & ACE Select_Track'\
-       "echo Exit"
+    local xmcd_path="$(which xmcd)"
+
+    # This allows the conditional to work with NetBSD's which command.  
+    if [ "$(echo $xmcd_path | cut -d ' ' -f 1)" == "no" ]; then
+       xmcd_path=""
+    fi
+    # Run xmcd if available.  
+    if [ "$xmcd_path" != "" ]; then
+       xmcd &
+    else
+       $ARSHELL -W 'CD Player' -r 2 -E \
+           'ACE -A CD_Player & ACE Play_CD'\
+           'ACE -A CD_Player & ACE Pause_CD'\
+           'ACE -A CD_Player & ACE Resume_CD'\
+           'ACE -A CD_Player & ACE Stop_CD'\
+           'ACE -A CD_Player & ACE Select_Track'\
+           "echo Exit"
+    fi
 }
 KillJuke()
 {