Removal of some problematic whitespace generated on MacOSX.

[clinton/abcde.git] / abcde.conf

diff --git a/abcde.conf b/abcde.conf
index 3abab9c..03be858 100644 (file)
--- a/abcde.conf
+++ b/abcde.conf
@@ -59,8 +59,10 @@
 # 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
+# faac, neroAacEnc - for AACENCODER
+# opusenc - for OPUSENCODER
+# default is a valid option for oggenc, lame, flac, speexenc, mpcenc, faac and opus.
 # Currently this affects the default location of the binary, the variable
 # to pick encoder command-line options from, and where the options are
 # given.
@@ -68,8 +70,9 @@
 #OGGENCODERSYNTAX=default
 #FLACENCODERSYNTAX=default
 #SPEEXENCODERSYNTAX=default
-#MPPENCODERSYNTAX=default
+#MPCENCODERSYNTAX=default
 #AACENCODERSYNTAX=default
+#OPUSENCODERSYNTAX=default
 
 # Specify the syntax of the normalize binary here - so far only 'normalize'
 # is supported.
@@ -126,8 +129,9 @@
 #OGGENC=oggenc
 #FLAC=flac
 #SPEEXENC=speexenc
-#MPPENC=mppenc
+#MPCENC=mpcenc
 #AACENC=faac
+#OPUSENC=opusenc
 
 #ID3=id3
 #EYED3=eyeD3
@@ -179,13 +183,25 @@
 #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=
+#For faac encoding try the following options (see also: faac --help):
+#AACENC=faac
+#AACENCOPTS='-q 250 -w -s'
+#OUTPUTTYPE="m4a"
+# For neroAacEnc encoding try the following options (see also neroAacEnc -help):
+#AACENC=neroAacEnc
+#AACENCOPTS='-q 0.65'
+#OUTPUTTYPE="m4a"
+#ATOMICPARSLEY='AtomicParsley'
+
+# OPUS
+# For the encoder options look at: opusenc -h.
+#OPUSENCOPTS='--bitrate 128'
 
 #ID3OPTS=
 #EYED3OPTS="--set-encoding=utf16-LE"
@@ -236,14 +252,14 @@
 # you can specify that here
 #WAVOUTPUTDIR=`pwd`
 
-# OUTPUTTYPE can be either "ogg", "mp3", "flac" or "spx", or a combination
+# OUTPUTTYPE can be either "ogg", "mp3", "flac", "spx", "opus" or a combination
 # of them separated with ",": "ogg,mp3".
 #OUTPUTTYPE=ogg
 
 # Output filename format - change this to reflect your inner desire to
 # organize things differently than everyone else :)
 # You have the following variables at your disposal:
-# OUTPUT, GENRE, ALBUMFILE, ARTISTFILE, TRACKFILE, and TRACKNUM.
+# OUTPUT, GENRE, ALBUMFILE, ARTISTFILE, TRACKFILE, TRACKNUM and YEAR.
 # Make sure to single-quote this variable. abcde will automatically create
 # the directory portion of this filename.
 # NOTICE: OUTPUTTYPE has been deprecated in the OUTPUTFORMAT string.