normalize-audio and files erased by the ripping tool

git-svn-id: http://abcde.googlecode.com/svn/trunk@16 a0fa61bc-5347-0410-a1a9-7f54aa4e1825

diff --git a/abcde b/abcde
index 5fedb1a..a447509 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -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

diff --git a/debian/changelog b/debian/changelog
index b1407cb..235dddd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,8 @@ abcde (2.1pre2.2.0-1) experimental; urgency=low
     (Closes: #95828). Geez! That is low bug number...
   * DATA tracks are now excluded from the ripping process using internally
     the cdparanoia "-Q" query option. If using another ripper, it does not
     (Closes: #95828). Geez! That is low bug number...
   * DATA tracks are now excluded from the ripping process using internally
     the cdparanoia "-Q" query option. If using another ripper, it does not

-    work (at least there is no support for them in abcde) (Closes: #112692).
+    work (at least there is no support for them in abcde) 
+    (Closes: #112692, #117412).

   * New "0" choice for "None of the above" has been introduced. If selected, a
     template is created and the user encouraged to edit it (Closes: #147683).
   * New options for when the PLAYLIST already exists: erase, append or keep.
   * New "0" choice for "None of the above" has been introduced. If selected, a
     template is created and the user encouraged to edit it (Closes: #147683).
   * New options for when the PLAYLIST already exists: erase, append or keep.


@@ -32,9 +33,10 @@ abcde (2.1pre2.2.0-1) experimental; urgency=low
   * Add CDDB information to Ogg/Vorbis and FLAC files (Closes: #265358).
   * Added INTERACTIVE option. Set it to "n" and there you go, without user
     interaction.
   * Add CDDB information to Ogg/Vorbis and FLAC files (Closes: #265358).
   * Added INTERACTIVE option. Set it to "n" and there you go, without user
     interaction.

-  * normalize has changes its name to normalize-audio.
+  * Changes normalize to normalize-audio (Closes: #267053)
+  * Copes with wav files being erased by the ripping tool.

 
 

- -- Jesus Climent <jesus.climent@hispalinux.es>  Fri, 20 Aug 2004 13:09:57 +0000
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Sun, 29 Aug 2004 00:34:19 +0300

 
 abcde (2.1.19-1) unstable; urgency=low
 
 
 abcde (2.1.19-1) unstable; urgency=low