normalize-audio and files erased by the ripping tool

[clinton/abcde.git] / abcde

diff --git a/abcde b/abcde
index 97168a2..a447509 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -11,7 +11,7 @@
 # Copyright for this work is to expire January 1, 2010, after which it
 # shall be public domain.
 
 # 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 ()
 {
 
 usage ()
 {


@@ -1560,9 +1560,12 @@ do_cdread_one ()
                debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] "$WAVDATA" >&2 ;;
        esac
        RETURN=$?
                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
                # 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
                 echo "readtrack-$FIRSTTRACKNUMBER: $CDROMREADER returned code $RETURN" >> "$ABCDETEMPDIR/errors"
                return $RETURN
        else


@@ -1620,9 +1623,12 @@ do_cdread ()
                debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] "$WAVDATA" >&2 ;;
        esac
        RETURN=$?
                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
                # 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
                 echo "readtrack-$UTRACKNUM: $CDROMREADER returned code $RETURN" >> "$ABCDETEMPDIR/errors"
                return $RETURN
        else


@@ -1668,6 +1674,7 @@ OGGENCODERSYNTAX=default
 FLACENCODERSYNTAX=default
 SPEEXENCODERSYNTAX=default
 MPPENCODERSYNTAX=default
 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:
 
 OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
 # Use the following VAOUTPUTFORMAT to revert to 2.0.x VA format:


@@ -1687,7 +1694,6 @@ READNICE=10
 DISTMP3NICE=10
 VARIOUSARTISTS=n
 VARIOUSARTISTSTYLE=forward
 DISTMP3NICE=10
 VARIOUSARTISTS=n
 VARIOUSARTISTSTYLE=forward

-NORMALIZERSYNTAX=default

 KEEPWAVS=n
 PADTRACKS=n
 CDDBCOPYLOCAL="n"
 KEEPWAVS=n
 PADTRACKS=n
 CDDBCOPYLOCAL="n"


@@ -1729,7 +1735,7 @@ MD5SUM=md5sum
 DISTMP3=distmp3
 VORBISCOMMENT=vorbiscomment
 METAFLAC=metaflac
 DISTMP3=distmp3
 VORBISCOMMENT=vorbiscomment
 METAFLAC=metaflac

-NORMALIZE=normalize
+NORMALIZE=normalize-audio

 CDSPEED=eject
 VORBISGAIN=vorbisgain
 
 CDSPEED=eject
 VORBISGAIN=vorbisgain