(get_decod_args): The third time field is *sectors*, not hundredths of

[flac-archive] / fa-rip

diff --git a/fa-rip b/fa-rip
index 1898dd55f51d892cff86381250405eb87b40af1e..c3316484f83c125d70f2b372311ac1476fcb3da5 100755 (executable)
--- a/fa-rip
+++ b/fa-rip
@@ -3,12 +3,15 @@
 # $Id$
 
 set -e
-setopt NULL_GLOB
 
-get_cddev () {
-    local raw
+function get_cddev {
+    typeset raw
     raw=$(sysctl -n kern.rawpartition > /dev/null | awk '{printf "%c",97+$0}')
 
+    if [[ -n ${ZSH_VERSION} ]]; then
+        setopt NULL_GLOB
+    fi
+
     for CDDEV in /dev/{cdroms/cdrom*,cdrom*,rcd*${raw},{a,}cd*c}; do
         [[ -e ${CDDEV} ]] && return 0
     done
@@ -27,11 +30,10 @@ fi
 dir=$(mktemp -d flac-archive.XXXXXXXXXX)
 cd ${dir}
 
-cdrdao read-toc --device ${CDDEV} --driver generic-mmc toc
-toc2cue toc cue
+mkcue ${CDDEV} > cue
 
 trackcount=$(grep -c 'TRACK.*AUDIO' cue)
 
 fa-tags ${trackcount}
 
-exec cdparanoia -d ${CDDEV} 1-$(grep -c 'TRACK.*AUDIO' cue) wav
+exec cdparanoia -d ${CDDEV} 1-${trackcount} wav