Add configurable options for replaygain tools.

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

diff --git a/abcde b/abcde
index 6fd1506..60c07ae 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -13,7 +13,7 @@
 #
 # $Id$
 
-VERSION='2.4.1'
+VERSION='2.4.0.1'
 
 usage ()
 {
@@ -541,14 +541,14 @@ do_replaygain()
                        done
                        case "$OUTPUT" in
                                flac)
-                                       run_command replaygain-flac nice $ENCNICE $METAFLAC --add-replay-gain "${OUTPUTFILES[@]}"
+                                       run_command replaygain-flac nice $ENCNICE $METAFLAC $FLACGAINOPTS "${OUTPUTFILES[@]}"
                                        #run_command replaygain-flac true
                                        ;;
                                vorbis|ogg)
-                                       run_command replaygain-vorbis nice $ENCNICE $VORBISGAIN --album "${OUTPUTFILES[@]}"
+                                       run_command replaygain-vorbis nice $ENCNICE $VORBISGAIN $VORBISGAINOPTS "${OUTPUTFILES[@]}"
                                        ;;
                                mp3)
-                                       run_command replaygain-mp3 nice $ENCNICE $MP3GAIN -a -k "${OUTPUTFILES[@]}"
+                                       run_command replaygain-mp3 nice $ENCNICE $MP3GAIN $MP3GAINOPTS "${OUTPUTFILES[@]}"
                                        ;;
                                mpc)
                                        run_command replaygain-mpc nice $ENCNICE $MPPGAIN --auto "${OUTPUTFILES[@]}"
@@ -3054,11 +3054,14 @@ BLADEENCOPTS=
 L3ENCOPTS=
 XINGMP3ENCOPTS=
 MP3ENCOPTS=
+MP3GAINOPTS="-a -k"
 # ogg
 VORBIZEOPTS=
 OGGENCOPTS=
+VORBISGAINOPTS="--album"
 # flac
 FLACOPTS=
+FLACGAINOPTS="--add-replay-gain"
 # speex
 SPEEXENCOPTS=
 # mpc

diff --git a/abcde.1 b/abcde.1
index dbdcf64..dd2c35d 100644 (file)
--- a/abcde.1
+++ b/abcde.1
@@ -368,10 +368,10 @@ CUE2DISCID (see option "\-X"), DIFF and HTTPGET.
 If you wish to specify command-line options to any of the programs abcde uses,
 set the following configuration file options: LAMEOPTS, TOOLAMEOPTS, GOGOOPTS,
 BLADEENCOPTS, L3ENCOPTS, XINGMP3ENCOPTS, MP3ENCOPTS, VORBIZEOPTS, OGGENCOPTS,
-FLACOPTS, SPEEXENCOPTS, MPPENCOPTS, AACENCOPTS, ID3OPTS, ID3V2OPTS,
+FLACOPTS, SPEEXENCOPTS, MPPENCOPTS, AACENCOPTS, ID3OPTS, ID3V2OPTS, MP3GAINOPTS,
 CDPARANOIAOPTS, CDDA2WAVOPTS, CDDAFSOPTS, CDDBTOOLOPTS, EJECTOPTS, DISTMP3OPTS,
 NORMALIZEOPTS, CDSPEEDOPTS, MKCUEOPTS, VORBISCOMMMENTOPTS, METAFLACOPTS,
-DIFFOPTS and HTTPGETOPTS.
+DIFFOPTS, FLACGAINOPTS, VORBISGAINOPTS and HTTPGETOPTS.
 .TP
 .B CDSPEEDVALUE
 Set the value of the CDROM speed. The default is to read the disc as fast as

diff --git a/changelog b/changelog
index b4922e8..486f33d 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,10 +1,11 @@
-abcde (2.4.1-1) unstable; urgency=low
+abcde (2.4.0.1-1) unstable; urgency=low
 
-  * Bumped to 2.4.1
+  * Bumped to 2.4.0.1
   * In manpage note a 2nd use for LOWDISK (or '-l' switch)
     it's faster and better on scratchy disks (Closes: #426343).
+  * Add configurable options for replaygain tools.
 
- -- Colin Tuckley <colint@debian.org>  Wed, 21 Oct 2009 21:41:28 +0100
+ -- Colin Tuckley <colint@debian.org>  Thu, 29 Oct 2009 19:09:47 +0000
 
 abcde 2.4.0
 

diff --git a/debian/changelog b/debian/changelog
index 1534f13..7759db2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-abcde (2.4.1-1) unstable; urgency=low
+abcde (2.4.0.1-1) unstable; urgency=low
 
-  * Bumped to 2.4.1
+  * Bumped to 2.4.0.1
   * In manpage note a 2nd use for LOWDISK (or '-l' switch)
     it's faster and better on scratchy disks (Closes: #426343).
+  * Add configurable options for replaygain tools (Closes: #426544).
 
- -- Colin Tuckley <colint@debian.org>  Wed, 21 Oct 2009 21:41:28 +0100
+ -- Colin Tuckley <colint@debian.org>  Thu, 29 Oct 2009 19:09:47 +0000
 
 abcde (2.4.0-1) unstable; urgency=low