X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/a40a6c271e5038a4c5a038455fa0a5a0e761463f..cb414c1e73121cc3d1e8c558a592bb3e302b806a:/abcde

diff --git a/abcde b/abcde
index d23fc80..d4bd83d 100755
--- a/abcde
+++ b/abcde
@@ -57,6 +57,7 @@ echo "       Show dielfs from the CDDB info (year,genre)"
 echo "-S <#> Set the CD speed"
 echo "-t <#> Start the track numbering at a given number"
 echo "-T <#> Same as -t but modifies tag numbering"
+echo "-u     Use UNICODE tags and comments"
 echo "-v     Show version number and exit"
 echo "-V     Be a bit more verbose about what is happening behind the scenes"
 echo "-x     Eject CD after all tracks are read"
@@ -377,6 +378,7 @@ do_replaygain()
 					;;
 			esac
 			OUTPUTFILES=""
+			REPLAYINDEX=0
 			for UTRACKNUM in $TRACKQUEUE
 			do
 				CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
@@ -387,21 +389,25 @@ do_replaygain()
 				ALBUMFILE="$(mungefilename "$DALBUM")"
 				do_gettracknum
 				if [ "$VARIOUSARTISTS" = "y" ]; then
-					OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT)
+					OUTPUTFILE="$(eval echo $VAOUTPUTFORMAT)"
 				else
-					OUTPUTFILE=$(eval echo $OUTPUTFORMAT)
+					OUTPUTFILE="$(eval echo $OUTPUTFORMAT)"
 				fi
-				OUTPUTFILES="$OUTPUTDIR/$OUTPUTFILE.$OUTPUT $OUTPUTFILES"
+				OUTPUTFILES[$REPLAYINDEX]="$OUTPUTDIR/$OUTPUTFILE.$OUTPUT"
+				(( REPLAYINDEX = $REPLAYINDEX + 1 ))
 			done
 			case "$OUTPUT" in
 				flac)
-					run_command replaygain-flac $METAFLAC --add-replay-gain $OUTPUTFILES
+					run_command replaygain-flac $METAFLAC --add-replay-gain "${OUTPUTFILES[@]}"
 					;;
 				vorbis|ogg)
-					run_command replaygain-vorbis $VORBISGAIN --album $OUTPUTFILES
+					run_command replaygain-vorbis $VORBISGAIN --album "${OUTPUTFILES[@]}"
 					;;
 				mp3)
-					run_command replaygain-mp3 $MP3GAIN -a $OUTPUTFILES
+					run_command replaygain-mp3 $MP3GAIN -a "${OUTPUTFILES[@]}"
+					;;
+				mpc)
+					run_command replaygain-mpc $MPPGAIN --auto "${OUTPUTFILES[@]}"
 					;;
 				*);;
 			esac
@@ -894,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
 						;;
 					*)
@@ -1039,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 ()
 {
@@ -2275,8 +2281,12 @@ fi
 decho ()
 {
 if [ x"$DEBUG" != "x" ]; then
-	DEBUGECHO=$(echo "$@" | tr -d '[]')
-	echo "[DEBUG] $DEBUGECHO: `eval echo \\$${DEBUGECHO}`"
+	if echo $1 | grep -q "^\[" ; then
+		DEBUGECHO=$(echo "$@" | tr -d '[]')
+		echo "[DEBUG] $DEBUGECHO: `eval echo \\$${DEBUGECHO}`"
+	else
+		echo "[DEBUG] $1"
+	fi
 fi
 }
 
@@ -2405,6 +2415,7 @@ NORMALIZE=normalize-audio
 CDSPEED=eject
 VORBISGAIN=vorbisgain
 MP3GAIN=mp3gain
+MPPGAIN=replaygain
 MKCUE=mkcue
 MKTOC=cdrdao
 DIFF=diff
@@ -2423,7 +2434,7 @@ MP3ENCOPTS=
 VORBIZEOPTS=
 OGGENCOPTS=
 # flac
-FLACOPTS="-f"
+FLACOPTS=
 # speex
 SPEEXENCOPTS=
 # mpc
@@ -2445,6 +2456,7 @@ MKCUEOPTS=
 MKTOCOPTS=""
 VORBISCOMMENTOPTS="-R"
 METAFLACOPTS="--no-utf8-convert"
+DIFFOPTS=
 
 # Default to one process if -j isn't specified
 MAXPROCS=1
@@ -2534,7 +2546,7 @@ fi
 
 # Parse command line options
 #while getopts 1a:A:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
-while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:vVxw:W:z opt ; do
+while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxw:W:z opt ; do
 	case "$opt" in
 		1) ONETRACK=y ;;
 		a) ACTIONS="$OPTARG" ;;
@@ -2567,11 +2579,9 @@ while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:vVxw:W:z opt ; do
 		R) DOREPLAYGAIN=y ;;
 		s) SHOWCDDBFIELDS="$OPTARG" ;;
 		S) CDSPEEDVALUE="$OPTARG" ;;
-#		t) PREPROCESSFORMATS="$OPTARG"
-#		   PREPROCESS=y ;;
-#		T) POSTPROCESSFORMATS="$OPTARG" ;;
 		t) STARTTRACKNUMBER="$OPTARG" ;;
 		T) STARTTRACKNUMBER="$OPTARG" ; STARTTRACKNUMBERTAG="y" ;;
+		u) CDDBPROTO=6 ;;
 		v) 
 		   echo "This is abcde v$VERSION."
 		   echo "Usage: abcde [options] [tracks]"
@@ -2605,6 +2615,9 @@ if echo $CDROM | grep -i -q '.flac$'; then
 	fi
 fi
 
+# If the user provided a DISCID, disable eject
+if [ -n "$DISCID" ]; then EJECTCD=n ; fi
+
 # Decide if we can continue.
 if [ "$ONETRACK" = "y" ]; then 
 	# FIXME # remove check as soon as we find out about the other readers
@@ -2860,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
@@ -3017,9 +3032,12 @@ if [ X"$CDSPEEDVALUE" != "X" ]; then
 	esac
 fi
 
+###USEPIPESSUPPORT###
+
 # Rippers with USEPIPE support
 # FIXME # Include here all the rippers we can figure out support pipes
 PIPERIPPER_cdparanoia="-"
+PIPERIPPER_debug="-"
 PIPERIPPER_flac="-c "
 
 # Encoders with USEPIPE support
@@ -3045,13 +3063,17 @@ if [ "$USEPIPES" = "y" ]; then
 		mpc)
 			PIPEENCODERSVARCHECK="PIPE_$MPPENCODER" ;;
 	esac
-	if [ "$( eval echo "\$$PIPERIPPERSVARCHECK" )" = "$" ] ; then
+	decho "PIPERIPPERSVARCHECK: $( eval echo "\$$PIPERIPPERSVARCHECK" )"
+	if [ "$( eval echo "\$$PIPERIPPERSVARCHECK" )" = "$" ] || \
+	   [ "$( eval echo "\$$PIPERIPPERSVARCHECK" )" = "" ] ; then
 		log error "no support for pipes with given ripper"
 		log error "read the USEPIPES file from the source tarball to get help."
 		log error "On a Debian system, it is under /usr/share/doc/abcde/USEPIPES.gz"
 		exit 1;
 	fi
-	if [ "$( eval echo "\$$PIPEENCODERSVARCHECK" )" = "$" ] ; then
+	decho "PIPEENCODERSVARCHECK: $( eval echo "\$$PIPEENCODERSVARCHECK" )"
+	if [ "$( eval echo "\$$PIPEENCODERSVARCHECK" )" = "$" ] || \
+	   [ "$( eval echo "\$$PIPEENCODERSVARCHECK" )" = "" ] ; then
 		log error "no support for pipes with given encoder"
 		log error "read the USEPIPES file from the source tarball to help"
 		log error "on a Debian system, read /usr/share/doc/abcde/USEPIPES.gz"
@@ -3067,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
@@ -3197,6 +3220,11 @@ else
 		if [ "$NOGAP" = "y" ] || [ "$BATCHNORM" = "y" ]; then
 		    :
 		else
+			# If we are not reading, set the encode output to loud already, so
+			# that we can see the output of the first track.
+			if [ "$MAXPROCS" = "1" ] && [ ! "$DOREAD" = "y" ]; then
+				echo "encode-output=loud" >> "$ABCDETEMPDIR/status"
+			fi
 			echo NEXTTRACK # Get the encoder machine churning again
 			if [ "$DOREAD" = "y" ]; then
 				if [ "$LOWDISK" = "y" ] && [ "$DOENCODE" = "y" ]; then
@@ -3450,6 +3478,11 @@ wait
 if [ "$DOREPLAYGAIN" = "y" ]; then
 	do_replaygain
 fi
+
+# FIXME #
+# Check if all the encoded formats have been actually moved to the final destination
+# ...
+
 # Check to see if run_command logged any errors
 if [ -f "$ABCDETEMPDIR/errors" ]; then
 	log error "The following commands failed to run:"