r187@frost: data | 2005-10-06 15:41:10 +0300

 * Added -z for easy and quick debug.
 * BATCH has been splitted into two options: BATCHNORM which allows, by using
   -b, to use the -a normalize in all the files at once, and NOGAP, that by
   using -g, introduces the lame's --nogap extension.
 * Added replygain using the appropiate tags with Ogg/Vorbis and Ogg/FLAC.

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

diff --git a/abcde b/abcde
index 42f44db..460c470 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -22,7 +22,7 @@ echo "-1     Encode the whole CD in a single file"
 echo "-a <action1[,action2]...>"
 echo "       Actions to perform (cddb,read,normalize,encode,tag,move,playlist,clean)"
 #echo "-A     Experimental actions (retag, transcode)"
 echo "-a <action1[,action2]...>"
 echo "       Actions to perform (cddb,read,normalize,encode,tag,move,playlist,clean)"
 #echo "-A     Experimental actions (retag, transcode)"

-echo "-b     Batch mode: enable album normalization and nogap encoding"
+echo "-b     Enable batch normalization"

 echo "-c <file>"
 echo "       Specify a configuration file (overrides system and user config files)"
 echo "-C <discid#>"
 echo "-c <file>"
 echo "       Specify a configuration file (overrides system and user config files)"
 echo "-C <discid#>"


@@ -33,6 +33,7 @@ echo "-D     Debugging mode (equivalent to sh -x abcde)"
 echo "-e     Erase encoded track information from status file"
 #echo "-E     Set the encoding information for the tags"
 echo "-f     Force operations that otherwise are considered harmful. Read \"man abcde\""
 echo "-e     Erase encoded track information from status file"
 #echo "-E     Set the encoding information for the tags"
 echo "-f     Force operations that otherwise are considered harmful. Read \"man abcde\""

+#echo "-g     "

 echo "-h     This help information"
 #echo "-i    Tag files while encoding, when possible (local only) -NWY-"
 echo "-j <#> Number of encoder processes to run at once (localhost)"
 echo "-h     This help information"
 #echo "-i    Tag files while encoding, when possible (local only) -NWY-"
 echo "-j <#> Number of encoder processes to run at once (localhost)"


@@ -53,8 +54,6 @@ echo "-R     Add replaygain values to the tag info (only for vorbis,flac)"
 echo "-s <field>"
 echo "       Show dielfs from the CDDB info (year,genre)"
 echo "-S <#> Set the CD speed"
 echo "-s <field>"
 echo "       Show dielfs from the CDDB info (year,genre)"
 echo "-S <#> Set the CD speed"

-#echo "-t    File types to preprocess (wav)"
-#echo "-T    Set postprocessing options"

 echo "-t <#> Start the track numbering at a given number"
 echo "-T <#> Same as -t but modifies tag numbering"
 echo "-v     Show version number and exit"
 echo "-t <#> Start the track numbering at a given number"
 echo "-T <#> Same as -t but modifies tag numbering"
 echo "-v     Show version number and exit"


@@ -720,40 +719,50 @@ do_tag ()
 
 }
 
 
 }
 

-# do_batch_encode
+# do_nogap_encode

 # variables used:
 # OUTPUTTYPE, {FOO}ENCODERSYNTAX, ENCNICE, ENCODER, ENCODEROPTS
 # variables used:
 # OUTPUTTYPE, {FOO}ENCODERSYNTAX, ENCNICE, ENCODER, ENCODEROPTS

-do_batch_encode ()
+do_nogap_encode ()

 {
        # The commands here don't go through run_command because they're never supposed to be silenced
 {
        # The commands here don't go through run_command because they're never supposed to be silenced

-       echo "Batch encoding tracks: $TRACKQUEUE"
-       OUTPUT=$(echo $OUTPUTTYPE | grep "mp3" )
-       case "$OUTPUT" in
-       mp3)
-               case "$MP3ENCODERSYNTAX" in
-               lame)
-                       (
-                       cd "$ABCDETEMPDIR"
-                       TRACKFILES=
-                       for UTRACKNUM in $TRACKQUEUE
-                       do
-                               TRACKFILES="$TRACKFILES track$UTRACKNUM.wav"
-                       done
-                       nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS `[ "$MP3ENCODER" = "lame" ] && echo "--nogap"` $TRACKFILES
-                       RETURN=$?
-                       if [ "$RETURN" != "0" ]; then
-                               echo "batch-encode: $ENCODER returned code $RETURN" >> errors
-                       else
+       echo "Encoding gapless MP3 tracks: $TRACKQUEUE"
+       for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
+       do
+               case "$OUTPUT" in
+               mp3)
+                       case "$MP3ENCODERSYNTAX" in
+                       lame)
+                               (
+                               cd "$ABCDETEMPDIR"
+                               TRACKFILES=

                                for UTRACKNUM in $TRACKQUEUE
                                do
                                for UTRACKNUM in $TRACKQUEUE
                                do

-                                       run_command encodetrack-$UTRACKNUM true
+                                       TRACKFILES="$TRACKFILES track$UTRACKNUM.wav"

                                done
                                done

-                       fi
-                       )
+                               nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS --nogap $TRACKFILES
+                               RETURN=$?
+                               if [ "$RETURN" != "0" ]; then
+                                       echo "nogap-encode: $ENCODER returned code $RETURN" >> errors
+                               else
+                                       for UTRACKNUM in $TRACKQUEUE
+                                       do
+                                               run_command encodetrack-$OUTPUT-$UTRACKNUM true
+                                               #run_command encodetrack-$UTRACKNUM true
+                                       done
+                               fi
+                               )
+                               ;;
+                       esac

                        ;;
                esac
                        ;;
                esac

-               ;;
-       esac
+       done            
+       if checkerrors "nogap-encode"; then :; else
+               if [ ! "$KEEPWAVS" = "y" ] ; then
+                       if [ ! "$KEEPWAVS" = "move" ] ; then
+                               rm -f "$IN"
+                       fi
+               fi
+       fi

        # Other encoders fall through to normal encoding as the tracks
        # have not been entered in the status file.
 }
        # Other encoders fall through to normal encoding as the tracks
        # have not been entered in the status file.
 }


@@ -807,6 +816,9 @@ do_encode ()
        if [ -s "$IN" -o X"$USEPIPES" = "Xy" ] ; then
                for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
                do
        if [ -s "$IN" -o X"$USEPIPES" = "Xy" ] ; then
                for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
                do

+                       if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then 
+                               continue
+                       fi

                        case "$OUTPUT" in
                                vorbis|ogg)
                                        OUT="$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"
                        case "$OUTPUT" in
                                vorbis|ogg)
                                        OUT="$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"


@@ -1368,7 +1380,7 @@ do_discid ()
                while [ "$X" -ne "$TRACKS" ]
                do
                        X=$(printf "%0.${TRACKNUMPADDING}d" $(expr $X + 1))
                while [ "$X" -ne "$TRACKS" ]
                do
                        X=$(printf "%0.${TRACKNUMPADDING}d" $(expr $X + 1))

-                       TRACKQUEUE=$(echo "$TRACKQUEUE" $X)
+                       TRACKQUEUE=$(echo $TRACKQUEUE $X)

                done
                echo $TRACKQUEUE
        else
                done
                echo $TRACKQUEUE
        else


@@ -1574,7 +1586,8 @@ do_localcddb ()
                        fi
                        if [ "$USELOCALRESP" = "y" ]; then
                                #echo "Using local copy of CDDB data"
                        fi
                        if [ "$USELOCALRESP" = "y" ]; then
                                #echo "Using local copy of CDDB data"

-                               cp "${CDDBLOCALFILE}" "$ABCDETEMPDIR/cddbread.1"
+                               echo "# DO NOT ERASE THIS LINE! Added by abcde to imitate cddb output" > "$ABCDETEMPDIR/cddbread.1"
+                               cat "${CDDBLOCALFILE}" >> "$ABCDETEMPDIR/cddbread.1"

                                echo 999 > "$ABCDETEMPDIR/cddbquery" # Assuming 999 isn't used by CDDB
                                echo cddb-readcomplete >> "$ABCDETEMPDIR/status"
                                do_cddbparse "${CDDBLOCALFILE}" > "$ABCDETEMPDIR/cddbchoices"
                                echo 999 > "$ABCDETEMPDIR/cddbquery" # Assuming 999 isn't used by CDDB
                                echo cddb-readcomplete >> "$ABCDETEMPDIR/status"
                                do_cddbparse "${CDDBLOCALFILE}" > "$ABCDETEMPDIR/cddbchoices"


@@ -2230,6 +2243,17 @@ if [ x"$EXTRAVERBOSE" != "x" ]; then
 fi
 }
 
 fi
 }
 

+# decho [message]
+#
+# decho outputs a debug message if DEBUG is selected
+decho ()
+{
+if [ x"$DEBUG" != "x" ]; then
+       DEBUGECHO=$(echo "$@" | tr -d '[]')
+       echo "[DEBUG] $DEBUGECHO: `eval echo \\$${DEBUGECHO}`"
+fi
+}
+

 # User-redefinable functions
 # Custom filename munging:
 mungefilename ()
 # User-redefinable functions
 # Custom filename munging:
 mungefilename ()


@@ -2308,6 +2332,8 @@ VARIOUSARTISTS=n
 VARIOUSARTISTSTYLE=forward
 KEEPWAVS=n
 PADTRACKS=n
 VARIOUSARTISTSTYLE=forward
 KEEPWAVS=n
 PADTRACKS=n

+NOGAP=n
+BATCHNORM=n

 
 # If using scsi devices, cdda2wav needs a CDROMID, instead of a device node
 # i.e. CDROMID="1,0,0"
 
 # If using scsi devices, cdda2wav needs a CDROMID, instead of a device node
 # i.e. CDROMID="1,0,0"


@@ -2319,6 +2345,7 @@ CDPARANOIACDROMBUS="d"
 # program paths - defaults to checking your $PATH
 # mp3
 LAME=lame
 # program paths - defaults to checking your $PATH
 # mp3
 LAME=lame

+TOOLAME=toolame

 GOGO=gogo
 BLADEENC=bladeenc
 L3ENC=l3enc
 GOGO=gogo
 BLADEENC=bladeenc
 L3ENC=l3enc


@@ -2359,6 +2386,7 @@ CUE2DISCID=cue2discid
 # Options for programs called from abcde
 # mp3
 LAMEOPTS=
 # Options for programs called from abcde
 # mp3
 LAMEOPTS=

+TOOLAMEOPTS=

 GOGOOPTS=
 BLADEENCOPTS=
 L3ENCOPTS=
 GOGOOPTS=
 BLADEENCOPTS=
 L3ENCOPTS=


@@ -2479,12 +2507,12 @@ fi
 
 # Parse command line options
 #while getopts 1a:A:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
 
 # Parse command line options
 #while getopts 1a:A:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do

-while getopts 1a:bc:C:d:Defhj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W:z opt ; do
+while getopts 1a:bc:C:d:Defghj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W:z opt ; do

        case "$opt" in
                1) ONETRACK=y ;;
                a) ACTIONS="$OPTARG" ;;
                A) EXPACTIONS="$OPTARG" ;;
        case "$opt" in
                1) ONETRACK=y ;;
                a) ACTIONS="$OPTARG" ;;
                A) EXPACTIONS="$OPTARG" ;;

-               b) BATCH=y ;;
+               b) BATCHNORM=y ;;

                c) if [ -e "$OPTARG" ] ; then . "$OPTARG" ; else echo "abcde error: config file \"$OPTARG\" cannot be found." >&2 ; exit 1 ; fi ;;
                C) DISCID="${OPTARG#abcde.}" ;;
                d) CDROM="$OPTARG" ;;
                c) if [ -e "$OPTARG" ] ; then . "$OPTARG" ; else echo "abcde error: config file \"$OPTARG\" cannot be found." >&2 ; exit 1 ; fi ;;
                C) DISCID="${OPTARG#abcde.}" ;;
                d) CDROM="$OPTARG" ;;


@@ -2494,6 +2522,7 @@ while getopts 1a:bc:C:d:Defhj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W:z opt ; do
                e) ERASEENCODEDSTATUS=y ;;
                E) ENCODING="$OPTARG" ;;
                f) FORCE=y ;;
                e) ERASEENCODEDSTATUS=y ;;
                E) ENCODING="$OPTARG" ;;
                f) FORCE=y ;;

+               g) NOGAP=y ;;

                i) INLINETAG=y ;;
                j) MAXPROCS="$OPTARG" ;;
                k) KEEPWAVS=y ;;
                i) INLINETAG=y ;;
                j) MAXPROCS="$OPTARG" ;;
                k) KEEPWAVS=y ;;


@@ -2531,7 +2560,7 @@ while getopts 1a:bc:C:d:Defhj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W:z opt ; do
                         exit 1
                   fi
                   ;;
                         exit 1
                   fi
                   ;;

-               z) CDROMREADERSYNTAX=debug ; EJECTCD="n" ;;
+               z) DEBUG=y ; CDROMREADERSYNTAX=debug ; EJECTCD="n" ;;

                ?) usage; exit ;;
        esac
 done
                ?) usage; exit ;;
        esac
 done


@@ -2558,9 +2587,13 @@ if [ "$ONETRACK" = "y" ]; then
                *) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode"
                   exit 1 ;;
        esac
                *) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode"
                   exit 1 ;;
        esac

-       if [ "$BATCH" = "y" ]; then
-               echo "abcde error: BATCH mode is not compatible with ONETRACK mode"
-               BATCH=n
+       if [ "$BATCHNORM" = "y" ]; then
+               echo "abcde warning: BATCHNORM mode is not compatible with ONETRACK mode. Disabling..."
+               BATCHNORM=n
+       fi
+       if [ "$NOGAP" = "y" ]; then
+               echo "abcde warning: NOGAP mode is not compatible with ONETRACK mode. Disabling..."
+               NOGAP=n

        fi
        # It does not matter how many tracks we want. In ONETRACK mode we grab them all
        # FIXME # allow ranges of tracks to be selected for onetrack ripping
        fi
        # It does not matter how many tracks we want. In ONETRACK mode we grab them all
        # FIXME # allow ranges of tracks to be selected for onetrack ripping


@@ -2667,6 +2700,14 @@ if [ X"$USEPIPES" = "Xy" ]; then
                # FIXME # Do we need to exit or shall we just disable the mode?
                exit 1
        fi
                # FIXME # Do we need to exit or shall we just disable the mode?
                exit 1
        fi

+       if [ X"$BATCHNORM" = "Xy" ]; then
+               echo "abcde error: Unix pipes not compatible with BATCHNORM encoding"
+               exit 1
+       fi
+       if [ X"$NOGAP" = "Xy" ]; then
+               echo "abcde error: Unix pipes not compatible with NOGAP encoding"
+               exit 1
+       fi

        if [ X"$DOENCODE" = "Xn" ]; then
                vecho "Disabling Unix pipes since we are not encoding!"
                USEPIPES=n
        if [ X"$DOENCODE" = "Xn" ]; then
                vecho "Disabling Unix pipes since we are not encoding!"
                USEPIPES=n


@@ -2677,6 +2718,21 @@ if [ X"$USEPIPES" = "Xy" ]; then
        fi
 fi
 
        fi
 fi
 

+# LOWDISK pre-tests, before we get into more problematic stuff
+# Not compatible with anything that needs all the files in the hard disc:
+# - BATCHNORM
+# - NOGAP lame mode
+if [ X"$LOWDISK" = "Xy" ]; then
+       if [ X"$BATCHNORM" = "Xy" ]; then
+               echo "abcde error: Unix pipes not compatible with BATCHNORM encoding"
+               exit 1
+       fi
+       if [ X"$NOGAP" = "Xy" ]; then
+               echo "abcde error: Unix pipes not compatible with NOGAP encoding"
+               exit 1
+       fi
+fi
+

 # Check the encoding format from the ones available in the system, if nothing has been configured in the system.
 if [ X"$OUTPUTTYPE" = "X" ]; then
        for DEFAULT_OUTPUT in $( echo "$DEFAULT_OUTPUT_BINARIES" | tr , \ ); do
 # Check the encoding format from the ones available in the system, if nothing has been configured in the system.
 if [ X"$OUTPUTTYPE" = "X" ]; then
        for DEFAULT_OUTPUT in $( echo "$DEFAULT_OUTPUT_BINARIES" | tr , \ ); do


@@ -2760,6 +2816,7 @@ do
                mp3)
                        [ "$MP3ENCODERSYNTAX" = "default" ] && MP3ENCODERSYNTAX=lame
                        [ "$DOTAG" = "y" ] && NEEDTAGGER=y
                mp3)
                        [ "$MP3ENCODERSYNTAX" = "default" ] && MP3ENCODERSYNTAX=lame
                        [ "$DOTAG" = "y" ] && NEEDTAGGER=y

+                       #[ "$NOGAP" = "y" ]

                        ;;
                flac)
                        [ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac
                        ;;
                flac)
                        [ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac


@@ -2790,6 +2847,10 @@ case "$MP3ENCODERSYNTAX" in
                MP3ENCODEROPTS="${MP3ENCODEROPTSCLI:-$LAMEOPTS}"
                MP3ENCODER="$LAME"
                ;;
                MP3ENCODEROPTS="${MP3ENCODEROPTSCLI:-$LAMEOPTS}"
                MP3ENCODER="$LAME"
                ;;

+       toolame)
+               MP3ENCODEROPTS="${MP3ENCODEROPTSCLI:-$TOOLAMEOPTS}"
+               MP3ENCODER="$TOOLAME"
+               ;;

        gogo)
                MP3ENCODEROPTS="${MP3ENCODEROPTSCLI:-$GOGOOPTS}"
                MP3ENCODER="$GOGO"
        gogo)
                MP3ENCODEROPTS="${MP3ENCODEROPTSCLI:-$GOGOOPTS}"
                MP3ENCODER="$GOGO"


@@ -2859,6 +2920,12 @@ else
        TAGGEROPTS="$ID3V2OPTS"
 fi
 
        TAGGEROPTS="$ID3V2OPTS"
 fi
 

+# Specific for NOGAP is the use of lame. Another encoder fails...
+if [ "$NOGAP" = "y" ] && [ ! "$MP3ENCODER" = "lame" ]; then
+       "abcde warning: the NOGAP option is specific of lame. Deactivating..."
+       NOGAP=n
+fi
+

 # Options for mkcue
 case "$CUEREADERSYNTAX" in
        default|mkcue)
 # Options for mkcue
 case "$CUEREADERSYNTAX" in
        default|mkcue)


@@ -3087,7 +3154,7 @@ else
                                fi
                        fi
                fi
                                fi
                        fi
                fi

-               if [ "$BATCH" = "y" ]; then
+               if [ "$NOGAP" = "y" ] || [ "$BATCHNORM" = "y" ]; then

                    :
                else
                        echo NEXTTRACK # Get the encoder machine churning again
                    :
                else
                        echo NEXTTRACK # Get the encoder machine churning again


@@ -3113,7 +3180,7 @@ if [ "$MAXPROCS" = "1" ]; then
 fi
 
 # All tracks read, start encoding.
 fi
 
 # All tracks read, start encoding.

-if [ "$BATCH" = "y" ] || [ "$ONETRACK" = "y" ]; then
+if [ "$NOGAP" = "y" ] || [ "$BATCHNORM" = "y" ] || [ "$ONETRACK" = "y" ]; then

        echo NEXTTRACK
 fi
 
        echo NEXTTRACK
 fi
 


@@ -3170,19 +3237,29 @@ fi
 #
 #) | (
 
 #
 #) | (
 

-# In batch mode, we want all tracks to be read first.
-if [ "$BATCH" = "y" ]; then
+# In BATCHNORM and/or NOGAP modes, we want all tracks to be read first.
+#BACK
+if [ "$BATCHNORM" = "y" ] || [ "$NOGAP" = "y" ]; then

        read GOAHEAD # For blocking - will contain either "NO" or "NEXTTRACK"
        if [ "$GOAHEAD" = "NO" ]; then break; fi
        for LASTTRACK in $TRACKQUEUE; do :; done
        if checkstatus readtrack-$LASTTRACK; then
        read GOAHEAD # For blocking - will contain either "NO" or "NEXTTRACK"
        if [ "$GOAHEAD" = "NO" ]; then break; fi
        for LASTTRACK in $TRACKQUEUE; do :; done
        if checkstatus readtrack-$LASTTRACK; then

-               if [ "$DONORMALIZE" = "y" ]; then
+               if [ "$DONORMALIZE" = "y" ] && [ "$BATCHNORM" = "y" ]; then

                        if checkstatus normalizetrack-$LASTTRACK; then :; else do_batch_normalize; fi
                        if checkstatus normalizetrack-$LASTTRACK; then :; else do_batch_normalize; fi

-                       if checkerrors batch-normalize; then exit; fi
+                       if checkerrors batch-normalize; then exit 1; fi

                fi
                fi

-               if [ "$DOENCODE" = "y" ]; then
-                       if checkstatus encodetrack-$LASTTRACK; then :; else do_batch_encode; fi
-                       if checkerrors batch-encode; then exit; fi
+               if [ "$DOENCODE" = "y" ] && [ "$NOGAP" = "y" ]; then
+                       if [ "$DONORMALIZE" = "y" ]; then
+                               for UTRACKNUM in $TRACKQUEUE
+                               do
+                                       if checkstatus readtrack-$UTRACKNUM; then
+                                               if checkstatus normalizetrack-$UTRACKNUM; then :; else do_normalize $UTRACKNUM; fi
+                                       fi
+                               done
+                       else
+                               if checkstatus encodetrack-$LASTTRACK; then :; else do_nogap_encode; fi
+                               if checkerrors nogap-encode; then exit 1; fi
+                       fi

                fi
        fi
 fi
                fi
        fi
 fi


@@ -3349,6 +3426,8 @@ fi
 if [ "$DOCLEAN" = "y" ] && [ ! "$FORCE" = "y" ]; then
        ENCODED_FORMATS=$(egrep "^encodetrack-(.{3,6})-(.{1,2})$" "$ABCDETEMPDIR/status" | cut -d"-" -f2 | sort -u | tr '\n' '|')
        MOVED_FORMATS=$(egrep "^movetrack-output-(.{3,6})$" "$ABCDETEMPDIR/status" | cut -d"-" -f3 | sort -u | tr '\n' '|')
 if [ "$DOCLEAN" = "y" ] && [ ! "$FORCE" = "y" ]; then
        ENCODED_FORMATS=$(egrep "^encodetrack-(.{3,6})-(.{1,2})$" "$ABCDETEMPDIR/status" | cut -d"-" -f2 | sort -u | tr '\n' '|')
        MOVED_FORMATS=$(egrep "^movetrack-output-(.{3,6})$" "$ABCDETEMPDIR/status" | cut -d"-" -f3 | sort -u | tr '\n' '|')

+       decho [ENCODED_FORMATS]
+       decho [MOVED_FORMATS]

        if [ "$ENCODED_FORMATS" != "$MOVED_FORMATS" ]; then
                echo "Not all encoded formats have been requested to be moved."
                echo "Use \"-a clean -f -C $DISCID\" to force the removal of the remaining data."
        if [ "$ENCODED_FORMATS" != "$MOVED_FORMATS" ]; then
                echo "Not all encoded formats have been requested to be moved."
                echo "Use \"-a clean -f -C $DISCID\" to force the removal of the remaining data."

diff --git a/abcde.1 b/abcde.1
index 73a26ed..ece9eb7 100644 (file)
--- a/abcde.1
+++ b/abcde.1
@@ -47,7 +47,7 @@ cddb, read, encode, tag. Playlist implies cddb. The default is to
 do all actions except normalize and playlist.
 .TP
 .B \-b
 do all actions except normalize and playlist.
 .TP
 .B \-b

-Enable batch mode normalization. See the BATCH configuration variable.
+Enable batch mode normalization. See the BATCHNORM configuration variable.

 .TP
 .B \-c [filename]
 Specifies an additional configuration file to parse. Configuration options
 .TP
 .B \-c [filename]
 Specifies an additional configuration file to parse. Configuration options


@@ -68,6 +68,15 @@ single-track flac file with embeded cuesheet.
 Capture debugging information (you'll want to redirect this \- try 'abcde \-D
 2>logfile')
 .TP
 Capture debugging information (you'll want to redirect this \- try 'abcde \-D
 2>logfile')
 .TP

+.B \-e
+Erase information about encoded tracks from the internal status file, to enable
+other encodings if the wav files have been kept.
+.TP
+.B \-g
+Enable lame's \-\-nogap option.  See the NOGAP variable. WARNING: lame's
+\-\-nogap disables the Xing mp3 tag.  This tag is required for mp3 players to
+correctly display track lengths when playing variable-bit-rate mp3 files.
+.TP

 .B \-h
 Get help information.
 .TP
 .B \-h
 Get help information.
 .TP


@@ -349,11 +358,18 @@ requires several hundred MB less space to complete the encoding of an
 entire CD. Use only if your system is low on space and cannot encode as
 quickly as it can read.
 .TP
 entire CD. Use only if your system is low on space and cannot encode as
 quickly as it can read.
 .TP

-.B BATCH
+.B BATCHNORM

 If set to y, enables batch mode normalization, which preserves relative
 volume differences between tracks of an album. Also enables nogap encoding
 when using the \'lame\' encoder.
 .TP
 If set to y, enables batch mode normalization, which preserves relative
 volume differences between tracks of an album. Also enables nogap encoding
 when using the \'lame\' encoder.
 .TP

+.B NOGAP
+Activate the lame's \-\-nogap option, that allows files found in CDs with no
+silence between songs (such as live concerts) to be encoded without noticeable
+gaps. WARNING: lame's \-\-nogap disables the Xing mp3 tag.  This tag is
+required for mp3 players to correctly display track lengths when playing
+variable-bit-rate mp3 files.
+.TP

 .B PLAYLISTFORMAT
 Specifies the format for completed playlist filenames. Works like the
 OUTPUTFORMAT configuration variable. Default is
 .B PLAYLISTFORMAT
 Specifies the format for completed playlist filenames. Works like the
 OUTPUTFORMAT configuration variable. Default is


@@ -421,17 +437,17 @@ Possible ways one can call abcde
 .B abcde
 Will work in most systems
 .TP
 .B abcde
 Will work in most systems
 .TP

-.B abcde -d /dev/cdrom2
+.B abcde \-d /dev/cdrom2

 If the CDROM you are reding from is not the standard /dev/cdrom (in GNU/Linux systems)
 .TP
 If the CDROM you are reding from is not the standard /dev/cdrom (in GNU/Linux systems)
 .TP

-.B abcde -o vorbis,flac
+.B abcde \-o vorbis,flac

 Will create both Ogg/Vorbis and Ogg/FLAC files.
 .TP
 Will create both Ogg/Vorbis and Ogg/FLAC files.
 .TP

-.B abcde -o vorbis:"-b 192"
+.B abcde \-o vorbis:"-b 192"

 Will pass "-b 192" to the Ogg/Vorbis encoder, without having to modify the
 config file
 .TP
 Will pass "-b 192" to the Ogg/Vorbis encoder, without having to modify the
 config file
 .TP

-.B abcde -W 1
+.B abcde \-W 1

 For double+ CD settings: will create the 1st CD starting with the track number
 101, and will add a comment "CD 1" to the tracks, the second starting with 201
 and so on.
 For double+ CD settings: will create the 1st CD starting with the track number
 101, and will add a comment "CD 1" to the tracks, the second starting with 201
 and so on.

diff --git a/debian/changelog b/debian/changelog
index cbc59e7..588a32e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,13 @@ abcde (2.3.99-1) unstable; urgency=low
   * Changed cdparanoia-audio-tracks to use the status file to save the data.
   * Added the possibility of using a singletrack flac file with an embeded
     cuesheet as a source of tracks.
   * Changed cdparanoia-audio-tracks to use the status file to save the data.
   * Added the possibility of using a singletrack flac file with an embeded
     cuesheet as a source of tracks.

+  * Added -z for easy and quick debug.
+  * BATCH has been splitted into two options: BATCHNORM which allows, by using
+    -b, to use the -a normalize in all the files at once, and NOGAP, that by
+    using -g, introduces the lame's --nogap extension.
+  * Added replygain using the appropiate tags with Ogg/Vorbis and Ogg/FLAC.

 
 

- -- Jesus Climent <jesus.climent@hispalinux.es>  Sat,  1 Oct 2005 14:44:03 +0300
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Thu,  6 Oct 2005 15:38:04 +0300

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