Fix for broken ripping with dagrab
authorAndrew Strong <andrew.david.strong@gmail.com>
Fri, 17 Apr 2015 05:00:39 +0000 (15:00 +1000)
committerAndrew Strong <andrew.david.strong@gmail.com>
Fri, 17 Apr 2015 05:04:13 +0000 (15:04 +1000)
This kick-starts ripping with dagrab, broken for some time. I
suspect some deeper work is required in do_cdread () however.
This closes issue 140.

abcde
changelog

diff --git a/abcde b/abcde
index 557ea4a..137291a 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -3012,13 +3012,10 @@ do_cdread ()
        else
                WAVDATA="$ABCDETEMPDIR/track$UTRACKNUM.wav"
                case "$CDROMREADERSYNTAX" in
-               ## FIXME ## Find the cases for dagrab and flac, to avoid exceptions
+               ## FIXME ## Find the cases for flac, to avoid exceptions
                        flac)
                                FILEARG="--output-name=$WAVDATA"
                                ;;
-                       dagrab)
-                               FILEARG="-f $WAVDATA"
-                               ;;
                        *)
                                FILEARG="$WAVDATA"
                                ;;
@@ -3060,9 +3057,7 @@ do_cdread ()
                                fi
                        fi
                        nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;;
-               ## FIXME ## We have an exception for dagrab, since it uses -f
-               ## FIXME ## Shall we just use -f $FILEARG ??
-               dagrab) nice $READNICE $CDROMREADER -d "$CDROM" -v $UTRACKNUM -f "$FILEARG" $REDIR;;
+               dagrab) nice $READNICE $CDROMREADER -d "$CDROM" -f "$FILEARG" -v $UTRACKNUM >&2 ;;
                pird)
                        if [ "$USEPIPES" = "y" ]; then
                                nice $READNICE $CDROMREADER -j ${READTRACKNUMS:-$UTRACKNUM} "$CDROM" "$FILEARG"
index eabca73..533e7f1 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,5 +1,6 @@
 abcde 2.6.1
 
+  * Fix for broken ripping with dagrab. Closes Issue 140.
   * Fix for diskutil selecting wrong disk on OS X. Thanks
     to Richard for this fix which closes Issue 139.
   * Added some error checking and documentation for