abcde.1,abcde.conf:

 - Missing default and new options added.
README
 - New changes added.
abcde
 - Help bits.
 - Force FLAC overwrite.
 - movecue compatibility with mp3cue plugin.

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

diff --git a/README b/README
index cff405e..638ff64 100644 (file)
--- a/README
+++ b/README
@@ -26,14 +26,21 @@ ID3TAGV=1
 MAJOR CHANGES
 =============
 Changes in 2.3:
 MAJOR CHANGES
 =============
 Changes in 2.3:

-* Support for mkcue, to create a CUE sheet of the CD structure.
+* Support for mkcue, to create a CUE sheet of the CD structure. It can be used
+  with "-1" to create a backup, so that later on the original CD can be
+  recreated.

 * New -o <output(1)>:<options(1)>,... way of passing specific options to an
   output. Now we can pass specific options without having to modify a config
   file. This feature was already present in the last versions of the 2.2 cycle.
 * New -o <output(1)>:<options(1)>,... way of passing specific options to an
   output. Now we can pass specific options without having to modify a config
   file. This feature was already present in the last versions of the 2.2 cycle.

-* Unix PIPEs, as a second way to encode files with a tight disc space.
-* Option to erase the "encoded" entries from the status file. Allows 
+* Unix PIPEs, as a second way to encode files with a low disc space.
+* Option to erase the "encoded" entries from the status file. Allows one to
+  encode the wav files (in case they were not erased) into another format. This
+  is needed until status information is stored for each format.

 * The "ogg" output mode will be substituted for "vorbis" in the near future.
   This release adds a compatibility layer so that both entries work.
 * The "ogg" output mode will be substituted for "vorbis" in the near future.
   This release adds a compatibility layer so that both entries work.

+* The FLAC encoder forces the files to be overwritten, in case they previously
+  exists. This avoids a half-through abcde run to continue without errors in
+  case it was cancelled during the FLAC encoding.

 
 Changes in 2.2:
 
 
 Changes in 2.2:
 

diff --git a/abcde b/abcde
index 9b51ecc..1649671 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -61,7 +61,8 @@ echo "       Add a comment to the CD tracks"
 echo "-W <#> Contatenate CDs: -T #01 -w \"CD #\"" 
 echo ""
 echo "Tracks is a space-delimited list of tracks to grab."
 echo "-W <#> Contatenate CDs: -T #01 -w \"CD #\"" 
 echo ""
 echo "Tracks is a space-delimited list of tracks to grab."

-echo "Ranges specified with hyphens are allowed."
+echo "Ranges specified with hyphens are allowed (i.e., 1-5)."
+echo ""

 #echo "Double hyphens are used to concatenate tracks"
 }
 
 #echo "Double hyphens are used to concatenate tracks"
 }
 


@@ -698,7 +699,7 @@ do_encode ()
                                case "$2" in
                                %local*%)
                                        case "$FLACENCODERSYNTAX" in
                                case "$2" in
                                %local*%)
                                        case "$FLACENCODERSYNTAX" in

-                                       flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER  $FLACENCODEROPTS -o "$OUT" "$IN" ;; 
+                                       flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER $FLACENCODEROPTS -o "$OUT" "$IN" ;; 

                                        esac
                                        ;;
        
                                        esac
                                        ;;
        


@@ -975,7 +976,9 @@ do_move ()
                                        vecho "Copying cue file to its destination directory..."
                                        if checkstatus onetrack >/dev/null ; then
                                                case $OUTPUT in
                                        vecho "Copying cue file to its destination directory..."
                                        if checkstatus onetrack >/dev/null ; then
                                                case $OUTPUT in

-                                                       mp3)
+                                                       # NOTE: Creating a cue file with the 3-char-extension files is to comply with
+                                                       # http://brianvictor.tripod.com/mp3cue.htm#details
+                                                       [a-z0-9][a-z0-9][a-z0-9])

                                                                run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTDIR/$OUTPUTFILE.cue"
                                                                ;;
                                                        *)
                                                                run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTDIR/$OUTPUTFILE.cue"
                                                                ;;
                                                        *)


@@ -985,6 +988,7 @@ do_move ()
                                        else
                                                run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTFILEDIR/$CUEFILE"
                                        fi
                                        else
                                                run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTFILEDIR/$CUEFILE"
                                        fi

+                                       echo movecue-$OUTPUT >> "$ABCDETEMPDIR/status"

                                fi
                        fi
                fi
                                fi
                        fi
                fi


@@ -2107,7 +2111,7 @@ MP3ENCOPTS=
 VORBIZEOPTS=
 OGGENCOPTS=
 # flac
 VORBIZEOPTS=
 OGGENCOPTS=
 # flac

-FLACOPTS=
+FLACOPTS="-f"

 # speex
 SPEEXENCOPTS=
 # mpc
 # speex
 SPEEXENCOPTS=
 # mpc

diff --git a/abcde.1 b/abcde.1
index 95f67e1..3f5326f 100644 (file)
--- a/abcde.1
+++ b/abcde.1
@@ -94,6 +94,10 @@ Non interactive mode. Do not ask anything from the user. Just go ahead.
 Create DOS-style playlists, modifying the resulting one by adding CRLF line
 endings. Some hardware players insist on having those to work.
 .TP
 Create DOS-style playlists, modifying the resulting one by adding CRLF line
 endings. Some hardware players insist on having those to work.
 .TP

+.B \-M
+Create a CUE file with information about the CD. Together with the possibility
+of creating a single file (see option "\-1"), one can recreate the original CD.
+.TP

 .B \-o [filetype][:filetypeoptions]
 Select output type. Can be "vorbis" (or "ogg"), "mp3", "flac", "spx" or "mpc".
 Specify a comma-delimited list of output types to obtain all specified types.
 .B \-o [filetype][:filetypeoptions]
 Select output type. Can be "vorbis" (or "ogg"), "mp3", "flac", "spx" or "mpc".
 Specify a comma-delimited list of output types to obtain all specified types.


@@ -112,9 +116,6 @@ the REMOTEHOSTS configuration variable.
 Add replaygain information to the id3 or tag information for play
 normalization. Only works with MP3 and Ogg/Vorbis.
 .TP
 Add replaygain information to the id3 or tag information for play
 normalization. Only works with MP3 and Ogg/Vorbis.
 .TP

-.B \-s [number]
-[DEPRECATED: use -t, see below]
-.TP

 .B \-S [speed]
 Set the speed of the CD drive. Needs CDSPEED and CDSPEEDOPTS set properly
 and both the program and device must support the capability.
 .B \-S [speed]
 Set the speed of the CD drive. Needs CDSPEED and CDSPEEDOPTS set properly
 and both the program and device must support the capability.


@@ -159,6 +160,9 @@ its compression format, 'vorbis' for '.ogg', '.mp3', '.flac', '.spx', or '.mpc'.
 abcde sources two configuration files on startup - /etc/abcde.conf and
 $HOME/.abcde.conf, in that order. 
 .TP
 abcde sources two configuration files on startup - /etc/abcde.conf and
 $HOME/.abcde.conf, in that order. 
 .TP

+The configuration options stated on those files can ba overriden by providing
+the appropiate flags at runtime.
+.TP

 The configuration variables have to be set as follows:
 .TP
 .B VARIABLE=value
 The configuration variables have to be set as follows:
 .TP
 .B VARIABLE=value


@@ -249,8 +253,8 @@ with distmp3 (DISTMP3NICE).
 The following configuration file options specify the pathnames of their
 respective utilities: LAME, GOGO, BLADEENC, L3ENC, XINGMP3ENC, MP3ENC, VORBIZE,
 OGGENC, FLAC, SPEEXENC, MPPENC, ID3, ID3V2, CDPARANOIA, CDDA2WAV, CDDAFS,
 The following configuration file options specify the pathnames of their
 respective utilities: LAME, GOGO, BLADEENC, L3ENC, XINGMP3ENC, MP3ENC, VORBIZE,
 OGGENC, FLAC, SPEEXENC, MPPENC, ID3, ID3V2, CDPARANOIA, CDDA2WAV, CDDAFS,

-CDDISCID, CDDBTOOL, EJECT, MD5SUM, DISTMP3, VORBISCOMMENT, NORMALIZE, CDSPEED
-and HTTPGET.
+CDDISCID, CDDBTOOL, EJECT, MD5SUM, DISTMP3, VORBISCOMMENT, NORMALIZE, CDSPEED,
+VORBISGAIN, MKCUE and HTTPGET.

 .TP
 .B COMMAND-LINE OPTIONS
 If you wish to specify command-line options to any of the programs abcde
 .TP
 .B COMMAND-LINE OPTIONS
 If you wish to specify command-line options to any of the programs abcde


@@ -258,7 +262,7 @@ uses, set the following configuration file options: LAMEOPTS, GOGOOPTS,
 BLADEENCOPTS, L3ENCOPTS, XINGMP3ENCOPTS, MP3ENCOPTS, VORBIZEOPTS, OGGENCOPTS,
 FLACOPTS, SPEEXENCOPTS, MPPENCOPTS, ID3OPTS, ID3V2OPTS, CDPARANOIAOPTS,
 CDDA2WAVOPTS, CDDAFSOPTS, CDDBTOOLOPTS, EJECTOPTS, DISTMP3OPTS, NORMALIZEOPTS,
 BLADEENCOPTS, L3ENCOPTS, XINGMP3ENCOPTS, MP3ENCOPTS, VORBIZEOPTS, OGGENCOPTS,
 FLACOPTS, SPEEXENCOPTS, MPPENCOPTS, ID3OPTS, ID3V2OPTS, CDPARANOIAOPTS,
 CDDA2WAVOPTS, CDDAFSOPTS, CDDBTOOLOPTS, EJECTOPTS, DISTMP3OPTS, NORMALIZEOPTS,

-CDSPEEDOPTS and HTTPGETOPTS.
+CDSPEEDOPTS, MKCUEOPTS,VORBISCOMMMENTOPTS, METAFLACOPTS and HTTPGETOPTS.

 .TP
 .B CDSPEEDVALUE
 Set the value of the CDROM speed. The default is to read the disc as fast as
 .TP
 .B CDSPEEDVALUE
 Set the value of the CDROM speed. The default is to read the disc as fast as

diff --git a/abcde.conf b/abcde.conf
index 68f014d..b049eff 100644 (file)
--- a/abcde.conf
+++ b/abcde.conf
@@ -114,6 +114,8 @@
 #VORBISCOMMENT=vorbiscomment
 #NORMALIZE=normalize-audio
 #CDSPEED=eject
 #VORBISCOMMENT=vorbiscomment
 #NORMALIZE=normalize-audio
 #CDSPEED=eject

+#VORBISGAIN=vorbisgain
+#MKCUE=mkcue

 
 # Options to call programs with:
 
 
 # Options to call programs with:
 


@@ -161,6 +163,9 @@
 #NORMALIZEOPTS=
 #CDSPEEDOPTS="-x"
 #CDSPEEDVALUE=""
 #NORMALIZEOPTS=
 #CDSPEEDOPTS="-x"
 #CDSPEEDVALUE=""

+#MKCUEOPTS=""
+#VORBISCOMMENTOPTS="-R"
+#METAFLACOPTS="--no-utf8-convert"

 
 # Actions to take
 # Comma-separated list of one or more of the following:
 
 # Actions to take
 # Comma-separated list of one or more of the following: