From: data <data@a0fa61bc-5347-0410-a1a9-7f54aa4e1825>
Date: Tue, 25 Oct 2005 09:33:40 +0000 (+0000)
Subject: Added replaygain to mpp
X-Git-Url: https://git.hcoop.net/clinton/abcde.git/commitdiff_plain/cb414c1e73121cc3d1e8c558a592bb3e302b806a?hp=cdbd4cc839c5187b953fa30d6a97410ff761ad83

Added replaygain to mpp

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

diff --git a/abcde b/abcde
index ac99e88..d4bd83d 100755
--- a/abcde
+++ b/abcde
@@ -406,6 +406,9 @@ do_replaygain()
 				mp3)
 					run_command replaygain-mp3 $MP3GAIN -a "${OUTPUTFILES[@]}"
 					;;
+				mpc)
+					run_command replaygain-mpc $MPPGAIN --auto "${OUTPUTFILES[@]}"
+					;;
 				*);;
 			esac
 		done
@@ -897,7 +900,7 @@ do_encode ()
 				case "$2" in
 				%local*%)
 					case "$FLACENCODERSYNTAX" in
-					flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER $FLACENCODEROPTS -o "$OUT" "$IN" ;; 
+					flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER -f $FLACENCODEROPTS -o "$OUT" "$IN" ;; 
 				        esac
 						;;
 					*)
@@ -1042,7 +1045,7 @@ do_single_gain ()
 
 # do_batch_gain
 # variables used:
-# MP3GAIN, MP3GAINOPTS, VORBISGAIN, VORBISGAINOPTS
+# MP3GAIN, MP3GAINOPTS, VORBISGAIN, VORBISGAINOPTS, MPPGAIN, MPPGAINOPTS
 # FIXME #
 do_batch_gain ()
 {
@@ -2412,6 +2415,7 @@ NORMALIZE=normalize-audio
 CDSPEED=eject
 VORBISGAIN=vorbisgain
 MP3GAIN=mp3gain
+MPPGAIN=replaygain
 MKCUE=mkcue
 MKTOC=cdrdao
 DIFF=diff
@@ -2430,7 +2434,7 @@ MP3ENCOPTS=
 VORBIZEOPTS=
 OGGENCOPTS=
 # flac
-FLACOPTS="-f"
+FLACOPTS=
 # speex
 SPEEXENCOPTS=
 # mpc
@@ -2869,9 +2873,11 @@ do
 			;;
 		spx)
 			[ "$SPEEXENCODERSYNTAX" = "default" ] && SPEEXENCODERSYNTAX=speexenc
+#			[ "$DOREPLAYGAIN" = "y" ] &&
 			;;
 		mpc)
 			[ "$MPPENCODERSYNTAX" = "default" ] && MPPENCODERSYNTAX=mppenc
+			[ "$DOREPLAYGAIN" = "y" ] && NEEDMPPGAIN=y
 			;;
 		wav)
 			if [ "$KEEPWAVS" = "y" ]; then
@@ -3083,6 +3089,7 @@ for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
 	${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
 	${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \
 	${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDMP3GAIN+$MP3GAIN} \
+	${NEEDMPPGAIN+$MPPGAIN} \
 	${NEEDCUEREADER+$CUEREADER} ${NEEDCUE2DISCID+$CUE2DISCID}
 do
 	# Cut off the command-line options we just added in
diff --git a/abcde.1 b/abcde.1
index 7d66d20..a157fd1 100644
--- a/abcde.1
+++ b/abcde.1
@@ -291,9 +291,10 @@ with distmp3 (DISTMP3NICE).
 .B PATHNAMES
 The following configuration file options specify the pathnames of their
 respective utilities: LAME, TOOLAME, GOGO, BLADEENC, L3ENC, XINGMP3ENC, MP3ENC,
-VORBIZE, OGGENC, FLAC, SPEEXENC, MPPENC, ID3, ID3V2, CDPARANOIA, CDDA2WAV,
-CDDAFS, CDDISCID, CDDBTOOL, EJECT, MD5SUM, DISTMP3, VORBISCOMMENT, NORMALIZE,
-CDSPEED, VORBISGAIN, MKCUE and HTTPGET.
+VORBIZE, OGGENC, FLAC, SPEEXENC, MPPENC, ID3, ID3V2, EYED3, METAFLAC,
+CDPARANOIA, CDDA2WAV, CDDAFS, CDDISCID, CDDBTOOL, EJECT, MD5SUM, DISTMP3,
+VORBISCOMMENT, NORMALIZE, CDSPEED, MP3GAIN, VORBISGAIN, MPPGAIN, MKCUE, MKTOC,
+DIFF and HTTPGET.
 .TP
 .B COMMAND-LINE OPTIONS
 If you wish to specify command-line options to any of the programs abcde uses,
@@ -301,7 +302,7 @@ set the following configuration file options: LAMEOPTS, TOOLAMEOPTS, GOGOOPTS,
 BLADEENCOPTS, L3ENCOPTS, XINGMP3ENCOPTS, MP3ENCOPTS, VORBIZEOPTS, OGGENCOPTS,
 FLACOPTS, SPEEXENCOPTS, MPPENCOPTS, ID3OPTS, ID3V2OPTS, CDPARANOIAOPTS,
 CDDA2WAVOPTS, CDDAFSOPTS, CDDBTOOLOPTS, EJECTOPTS, DISTMP3OPTS, NORMALIZEOPTS,
-CDSPEEDOPTS, MKCUEOPTS,VORBISCOMMMENTOPTS, METAFLACOPTS DIFFOPTS and
+CDSPEEDOPTS, MKCUEOPTS, VORBISCOMMMENTOPTS, METAFLACOPTS, DIFFOPTS and
 HTTPGETOPTS.
 .TP
 .B CDSPEEDVALUE