X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/3279389d8ee446d738a258c4f8b82e5ca92d8126..c4df517cf6863efa5b76b2dcce23547bddfa32cb:/abcde.conf

diff --git a/abcde.conf b/abcde.conf
index e3cd89f..afeba9e 100644
--- a/abcde.conf
+++ b/abcde.conf
@@ -5,6 +5,8 @@
 # .abcde.conf file in your home directory.
 
 # CDDB options
+# Choose whether you want to use CDDB or Musicbrainz. Default is CDDB
+#CDDBMETHOD=cddb
 
 # If you wish to use a different CDDB server, edit this line.
 # If you just wanted to use a proxy server, just set your http_proxy
@@ -57,8 +59,8 @@
 # lame, gogo, bladeenc, l3enc, xingmp3enc, mp3enc - for MP3ENCODERSYNTAX
 # flac - the only supported for FLACENCODERSYNTAX at the moment
 # speexenc - the only encoder for SPEEXENCODERSYNTAX
-# mppenc - encoder for MPPENCODERSYNTAX
-# default is a valid option for oggenc, lame, flac, speexenc and mppenc.
+# mpcenc - encoder for MPCENCODERSYNTAX
+# default is a valid option for oggenc, lame, flac, speexenc and mpcenc.
 # Currently this affects the default location of the binary, the variable
 # to pick encoder command-line options from, and where the options are
 # given.
@@ -66,7 +68,7 @@
 #OGGENCODERSYNTAX=default
 #FLACENCODERSYNTAX=default
 #SPEEXENCODERSYNTAX=default
-#MPPENCODERSYNTAX=default
+#MPCENCODERSYNTAX=default
 #AACENCODERSYNTAX=default
 
 # Specify the syntax of the normalize binary here - so far only 'normalize'
@@ -74,7 +76,7 @@
 #NORMALIZERSYNTAX=default
 
 # CD reader program to use - currently recognized options are 'cdparanoia',
-# 'cdda2wav', 'dagrab', 'cddafs' (Mac OS X only) and 'flac'.
+# 'icedax', 'cdda2wav', 'dagrab', 'cddafs' (Mac OS X only) and 'flac'.
 #CDROMREADERSYNTAX=cdparanoia
 
 # CUE reader syntax for the CUE reader program to use.
@@ -124,13 +126,13 @@
 #OGGENC=oggenc
 #FLAC=flac
 #SPEEXENC=speexenc
-#MPPENC=mppenc
+#MPCENC=mpcenc
 #AACENC=faac
 
 #ID3=id3
-#ID3V2=id3v2
+#EYED3=eyeD3
 #CDPARANOIA=cdparanoia
-#CDDA2WAV=cdda2wav
+#CDDA2WAV=icedax
 #CDDAFS=cp
 #CDDISCID=cd-discid
 #CDDBTOOL=cddb-tool
@@ -177,16 +179,16 @@
 #SPEEXENCOPTS=
 
 # MPP/MP+ (Musepack):
-# For the encoder options take a look at the manpage. Set them like this:
-# MPPENCOPTS='--xtreme' if you wish to set more options then:
-# MPPENCOPTS='--xtreme --skip 20 --fade 10'
-#MPPENCOPTS=
+# For the encoder options look at: mpcenc --longhelp. Set them like this:
+# MPCENCOPTS='--xtreme' if you wish to set more options then:
+# MPCENCOPTS='--xtreme --skip 20 --fade 10'
+#MPCENCOPTS=
 
 # M4A/AAC
 #AACENCOPTS=
 
 #ID3OPTS=
-#ID3V2OPTS=
+#EYED3OPTS="--set-encoding=utf16-LE"
 #CDPARANOIAOPTS=
 #CDDA2WAVOPTS=
 #CDDAFSOPTS="-f"
@@ -271,7 +273,7 @@
 #BATCHNORM=n
 
 # Enables nogap encoding when using the 'lame' encoder.
-#NOGAP=n
+#NOGAP=y
 
 # Set the playlist file location format. Uses the same variables and format
 # as OUTPUTFORMAT. If the playlist is specified to be in a subdirectory, it
@@ -363,6 +365,6 @@
 # distmp3host to be installed and running on all remote machines - see README)
 #REMOTEHOSTS=foo,bar,baz,quux,qiix
 
-# Set to obtain some information about actions happening in the background
+# Set to 1,2, etc. to obtain some information about actions happening in the background
 # Useful if you have a slow network or CDDB servers seem unresponsive.
-#EXTRAVERBOSE=n
+#EXTRAVERBOSE=0