Several additions to usepipes
authorAndrew Strong <andrew.david.strong@gmail.com>
Tue, 7 Apr 2015 20:35:53 +0000 (06:35 +1000)
committerAndrew Strong <andrew.david.strong@gmail.com>
Tue, 7 Apr 2015 20:35:53 +0000 (06:35 +1000)
The following encoders have been added to usepipes:

 1. mp3enc: mp3
 2. speexenc: Speex
 3. mpcenc: Musepack SV8
 4. wavpack: WavPack

The cd ripper cdda2wav (icedax) has also been added.

abcde
changelog

diff --git a/abcde b/abcde
index 65b25c3..d64436c 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -1070,9 +1070,6 @@ do_encode ()
                        wv)
                                TEMPARG="PIPE_$WVENCODERSYNTAX"
                                ;;
-                       ape)
-                               TEMPARG="PIPE_$APENCODERSYNTAX"
-                               ;;
                        aac)
                                TEMPARG="PIPE_$AACENCODERSYNTAX"
                                ;;
@@ -1083,23 +1080,6 @@ do_encode ()
                IN="$( eval echo "\$$TEMPARG" )"
        else
                IN="$ABCDETEMPDIR/track$1.wav"
-               case "$OUTPUT" in
-                       mp3)
-                               case "$MP3ENCODERSYNTAX" in
-                                       # FIXME # check if mp3enc needs -if for pipes
-                                       # FIXME # I have not been able to find a working mp3enc binary
-                                       mp3enc)
-                                               FILEARG="-if $IN"
-                                               ;;
-                                       *)
-                                               FILEARG="$IN"
-                                               ;;
-                               esac
-                               ;;
-                       *)
-                               FILEARG="$IN"
-                               ;;
-               esac
        fi
        # We need IN to proceed, if we are not using pipes.
        if [ -s "$IN" -o X"$USEPIPES" = "Xy" ] ; then
@@ -1145,7 +1125,6 @@ do_encode ()
                                        lame|toolame|gogo) $RUN_COMMAND nice $EFFECTIVE_NICE $MP3ENCODER $MP3ENCODEROPTS "$IN" "$OUT" ;;
                                        bladeenc) $RUN_COMMAND nice $EFFECTIVE_NICE $MP3ENCODER $MP3ENCODEROPTS -quit "$IN" ;;
                                        l3enc|xingmp3enc) $RUN_COMMAND nice $EFFECTIVE_NICE $MP3ENCODER "$IN" "$OUT" $MP3ENCODEROPTS ;;
-                                       # FIXME # Relates to the previous FIXME since it might need the "-if" removed.
                                        mp3enc) $RUN_COMMAND nice $EFFECTIVE_NICE $MP3ENCODER -if "$IN" -of "$OUT" $MP3ENCODEROPTS ;;
                                        esac
                                        ;;
@@ -4150,19 +4129,23 @@ fi
 ###USEPIPESSUPPORT###
 
 # Rippers with USEPIPE support
-# FIXME # Include here all the rippers we can figure out support pipes
 PIPERIPPER_cdparanoia="-"
+# Note that by default in abcde cdda2wav redirects to icedax.        
+PIPERIPPER_cdda2wav="-"
 PIPERIPPER_debug="-"
 PIPERIPPER_flac="-c "
 PIPERIPPER_pird="-"
 
 # Encoders with USEPIPE support
-# FIXME # Include here all the encoders we can figure out support pipes
+PIPE_mp3enc="-sti"
 PIPE_lame="-"
 PIPE_bladeenc="-"
 PIPE_oggenc="-"
 PIPE_opusenc="-"
 PIPE_flac="-"
+PIPE_speexenc="-"
+PIPE_mpcenc="-"
+PIPE_wavpack="-"
 
 # Figure out if we can use pipes with the ripper/encoder combination
 # exit otherwise
@@ -4183,8 +4166,6 @@ if [ "$USEPIPES" = "y" ]; then
                        PIPEENCODERSVARCHECK="PIPE_$MPCENCODER" ;;
                wv)
                        PIPEENCODERSVARCHECK="PIPE_$WVENCODER" ;;
-               ape)
-                       PIPEENCODERSVARCHECK="PIPE_$APENCODER" ;;
        esac
        decho "PIPERIPPERSVARCHECK: $( eval echo "\$$PIPERIPPERSVARCHECK" )"
        if [ "$( eval echo "\$$PIPERIPPERSVARCHECK" )" = "$" ] || \
index 4d15825..975b08b 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,5 +1,14 @@
 abcde 2.6.1
 
+  * Several additions to usepipes with the following encoders 
+    being added:
+      1. mp3enc: mp3
+      2. speexenc: Speex
+      3. mpcenc: Musepack SV8
+      4. wavpack: WavPack
+    The cd ripper cdda2wav (icedax) has also been added.
+  * Ripping and encoding with 'usepipes' fixed. This fix
+    closes Issue 46.
   * Suggested encoding options for mp3enc added to the sample
     abcde.conf. Last release of mp3enc in 1998 but it still
     works flawlessly with a modern abcde!