Small changes documented and some typo corrected

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

diff --git a/FAQ b/FAQ
index 3c054dc..1412acf 100644 (file)
--- a/FAQ
+++ b/FAQ
@@ -146,12 +146,12 @@ A. Set abcde to rip the first CD and give it the option "-t 101". Use a generic
    name and the tag/comment information.
 
 Q. I have a live concert. I want to encode it in a single file. How do i do it?
-A. Use "-1" and it will be encoded in a single file. Use "-M" to make a CUE
-   sheet file where the information about the tracks is stored.
+A. Use "-1" and it will be encoded in a single file. Use "cue" as an action to
+   make a CUE sheet file where the information about the tracks is stored.
 
 Q. Can I use abcde to take a backup of my CD collection?
-A. Yes. Use "abcde -1 -o flac -M" and it will create a single-track FLAC file
-   with an embedded cuesheet. Later on, you can use the command
+A. Yes. Use "abcde -1 -o flac -a default,cue" and it will create a single-track
+   FLAC file with an embedded cuesheet. Later on, you can use the command
    "abcde -o vorbis -d flac-file.flac" to extract the individual tracks in
    Ogg/Vorbis format. Of course you can select whatever format you want.
    

diff --git a/abcde b/abcde
index 55d2831..803bb58 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -354,7 +354,7 @@ checkexec ()
                # Cut off any command-line option we added in
                X=$(echo $@ | cut -d' ' -f2)
                # Test for built-in abcde.function
-               [ "$X" != "${X#abcde.}" ] && type $X >/dev/null 2&>1 && return
+               [ "$X" != "${X#abcde.}" ] && type $X >/dev/null 2>&1 && return
                if [ "$(which $X)" = "" ]; then
                        log error "$X is not in your path." >&2
                        log info  "Define the full path to the executable if it exists on your system." >&2
@@ -1665,6 +1665,9 @@ do_discid ()
                        flac)
                                if $METAFLAC $METAFLACOPTS --export-cuesheet-to=- "$CDROM" > /dev/null 2>&1 ; then
                                        case "$CUE2DISCID" in
+                                               # FIXME # right now we have 2 cue2discid internal
+                                               # implementations: builtin and abcde.cue2discid. Test
+                                               # both of them and decide which one we want to use.
                                                builtin)
                                                        #vecho "Using builtin cue2discid implementation..."
                                                        CUESHEET="$(metaflac $METAFLACOPTS --export-cuesheet-to=- "$CDROM")"
@@ -2132,6 +2135,7 @@ do_musicbrainzstat ()
 
 do_musicbrainz ()
 {
+# Use MBE_TOCGetCDIndexId on a perl query
        :
 }
 

diff --git a/abcde.1 b/abcde.1
index 657eea0..67a52d2 100644 (file)
--- a/abcde.1
+++ b/abcde.1
@@ -134,12 +134,6 @@ 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
-.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.
-If the cuesheet is embedded in a flac single file it can be used as source for
-encoding other formats (see option "\-d").
-.TP
 .B \-o [filetype][:filetypeoptions]
 Select output type. Can be "vorbis" (or "ogg"), "mp3", "flac", "spx", "mpc",
 "m4a" or "wav".  Specify a comma-delimited list of output types to obtain all

diff --git a/abcde.conf b/abcde.conf
index 163d85c..7ec40d1 100644 (file)
--- a/abcde.conf
+++ b/abcde.conf
@@ -77,10 +77,17 @@
 # 'cdda2wav', 'dagrab', 'cddafs' (Mac OS X only) and 'flac'.
 #CDROMREADERSYNTAX=cdparanoia
 
-# CUE reader program to use.
-# Right now we only support 'mkcue', but this might change in the future.
+# CUE reader syntax for the CUE reader program to use.
+# abcde supports 2 CUE modes: 'mkcue' and 'abcde.mkcue' so you can set the
+# MKCUE variable accordingly. The 'abcde.mkcue' uses an internal
+# implementation, without the need of an external program.
 #CUEREADERSYNTAX=default
 
+# Specify the program to convert a CUE sheet back to a CD disc ID for CDDB queries.
+# Select between '/path/to/cue2discid' (provided as an example) or
+# 'abcde.cue2discid', implemented internaly.
+#CUE2DISCID=abcde.cue2discid
+
 # Keep the wav files after encoding. Set it to "y" and remove "clean" from
 # the list of default actions, since we purge the temp directory as default.
 #KEEPWAVS=n