1 | --- ./abcde.orig Thu Apr 7 19:12:15 2005 |
---|
2 | +++ ./abcde Thu Apr 7 19:12:30 2005 |
---|
3 | @@ -1520,7 +1520,7 @@ |
---|
4 | WAVDATA="$ABCDETEMPDIR/track$FIRSTTRACKNUMBER.wav" |
---|
5 | echo "Grabbing the CD to a single track..." >&2 |
---|
6 | case "$CDROMREADERSYNTAX" in |
---|
7 | - cdparanoia) nice $READNICE $CDROMREADER -d $CDROM "1-" "$WAVDATA" >&2 ;; |
---|
8 | + cdparanoia) nice $READNICE $CDROMREADER "1-" "$WAVDATA" >&2 ;; |
---|
9 | cdda2wav) |
---|
10 | if [ "$OSFLAVOUR" = "OSX" ] ; then |
---|
11 | # Hei, we have to unmount the device before running anything like cdda2wav in OSX |
---|
12 | @@ -1538,7 +1538,7 @@ |
---|
13 | fi |
---|
14 | nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t 1+$LASTTRACKNUM "$WAVDATA" >&2 |
---|
15 | ;; |
---|
16 | - dagrab) nice $READNICE $CDROMREADER -d $CDROM -f $WAVDATA -v $UTRACKNUM >&2 ;; |
---|
17 | + dagrab) nice $READNICE $CDROMREADER -f $WAVDATA -v $UTRACKNUM >&2 ;; |
---|
18 | cddafs) |
---|
19 | # Find the track's mounted path |
---|
20 | REALTRACKNUM=$(expr $UTRACKNUM + 0) |
---|
21 | @@ -1550,7 +1550,7 @@ |
---|
22 | else |
---|
23 | false |
---|
24 | fi ;; |
---|
25 | - debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] "$WAVDATA" >&2 ;; |
---|
26 | + debug) nice $READNICE $CDROMREADER -w $UTRACKNUM-[:1] "$WAVDATA" >&2 ;; |
---|
27 | esac |
---|
28 | RETURN=$? |
---|
29 | if [ "$RETURN" != "0" -o ! -s "$WAVDATA" ]; then |
---|
30 | @@ -1583,7 +1583,7 @@ |
---|
31 | echo "Grabbing track $UTRACKNUM..." >&2 |
---|
32 | fi |
---|
33 | case "$CDROMREADERSYNTAX" in |
---|
34 | - cdparanoia) nice $READNICE $CDROMREADER -d $CDROM $UTRACKNUM "$WAVDATA" >&2 ;; |
---|
35 | + cdparanoia) nice $READNICE $CDROMREADER $UTRACKNUM "$WAVDATA" >&2 ;; |
---|
36 | cdda2wav) |
---|
37 | if [ "$OSFLAVOUR" = "OSX" ] ; then |
---|
38 | # Hei, we have to unmount the device before running anything like cdda2wav in OSX |
---|
39 | @@ -1601,7 +1601,7 @@ |
---|
40 | fi |
---|
41 | nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t $UTRACKNUM "$WAVDATA" >&2 |
---|
42 | ;; |
---|
43 | - dagrab) nice $READNICE $CDROMREADER -d $CDROM -f $WAVDATA -v $UTRACKNUM >&2 ;; |
---|
44 | + dagrab) nice $READNICE $CDROMREADER -f $WAVDATA -v $UTRACKNUM >&2 ;; |
---|
45 | cddafs) |
---|
46 | # Find the track's mounted path |
---|
47 | REALTRACKNUM=$(expr $UTRACKNUM + 0) |
---|
48 | @@ -1613,7 +1613,7 @@ |
---|
49 | else |
---|
50 | false |
---|
51 | fi ;; |
---|
52 | - debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] "$WAVDATA" >&2 ;; |
---|
53 | + debug) nice $READNICE $CDROMREADER -w $UTRACKNUM-[:1] "$WAVDATA" >&2 ;; |
---|
54 | esac |
---|
55 | RETURN=$? |
---|
56 | if [ "$RETURN" != "0" -o ! -s "$WAVDATA" ]; then |
---|