# Copyright for this work is to expire January 1, 2010, after which it
# shall be public domain.
-VERSION="2.2pre3"
+VERSION="2.1pre2.2.0"
usage ()
{
debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] "$WAVDATA" >&2 ;;
esac
RETURN=$?
- if [ "$RETURN" != "0" ]; then
+ if [ "$RETURN" != "0" -o ! -s "$WAVDATA" ]; then
# Thank goodness errors is only machine-parseable up to the
# first colon, otherwise this woulda sucked
+ if [ "$RETURN" = "0" -a ! -s "$WAVDATA" ]; then
+ RETURN=73 # fake a return code as cdparanoia return 0 also on aborted reads
+ fi
echo "readtrack-$FIRSTTRACKNUMBER: $CDROMREADER returned code $RETURN" >> "$ABCDETEMPDIR/errors"
return $RETURN
else
debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] "$WAVDATA" >&2 ;;
esac
RETURN=$?
- if [ "$RETURN" != "0" ]; then
+ if [ "$RETURN" != "0" -o ! -s "$WAVDATA" ]; then
# Thank goodness errors is only machine-parseable up to the
# first colon, otherwise this woulda sucked
+ if [ "$RETURN" = "0" -a ! -s "$WAVDATA" ]; then
+ RETURN=73 # fake a return code as cdparanoia return 0 also on aborted reads
+ fi
echo "readtrack-$UTRACKNUM: $CDROMREADER returned code $RETURN" >> "$ABCDETEMPDIR/errors"
return $RETURN
else
FLACENCODERSYNTAX=default
SPEEXENCODERSYNTAX=default
MPPENCODERSYNTAX=default
+NORMALIZERSYNTAX=default
OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
# Use the following VAOUTPUTFORMAT to revert to 2.0.x VA format:
DISTMP3NICE=10
VARIOUSARTISTS=n
VARIOUSARTISTSTYLE=forward
-NORMALIZERSYNTAX=default
KEEPWAVS=n
PADTRACKS=n
CDDBCOPYLOCAL="n"
DISTMP3=distmp3
VORBISCOMMENT=vorbiscomment
METAFLAC=metaflac
-NORMALIZE=normalize
+NORMALIZE=normalize-audio
CDSPEED=eject
VORBISGAIN=vorbisgain