X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/0709e6446867e6f27b9c6e89ac3984975bb97c2d..73b0af6ed427ce7daa5313858de5038ff5a7fb6f:/abcde

diff --git a/abcde b/abcde
index 460c470..3fc4cc5 100755
--- a/abcde
+++ b/abcde
@@ -20,9 +20,10 @@ echo "Usage: abcde [options] [tracks]"
 echo "Options:"
 echo "-1     Encode the whole CD in a single file"
 echo "-a <action1[,action2]...>"
-echo "       Actions to perform (cddb,read,normalize,encode,tag,move,playlist,clean)"
+echo "       Actions to perform (cddb,read,normalize,encode,tag,move,replaygain,playlist,clean)"
 #echo "-A     Experimental actions (retag, transcode)"
 echo "-b     Enable batch normalization"
+#echo "-B     Disable batch replaygain (do file by file)"
 echo "-c <file>"
 echo "       Specify a configuration file (overrides system and user config files)"
 echo "-C <discid#>"
@@ -33,7 +34,7 @@ echo "-D     Debugging mode (equivalent to sh -x abcde)"
 echo "-e     Erase encoded track information from status file"
 #echo "-E     Set the encoding information for the tags"
 echo "-f     Force operations that otherwise are considered harmful. Read \"man abcde\""
-#echo "-g     "
+echo "-g     Use \"lame --nogap\" for MP3 encoding. Disables low disk and pipes flags"
 echo "-h     This help information"
 #echo "-i    Tag files while encoding, when possible (local only) -NWY-"
 echo "-j <#> Number of encoder processes to run at once (localhost)"
@@ -50,12 +51,13 @@ echo "-p     Pad track numbers with 0's (if less than 10 tracks)"
 echo "-P     Use UNIX pipes to read+encode without wav files"
 echo "-r <host1[,host2]...>"
 echo "       Also encode on these remote hosts"
-echo "-R     Add replaygain values to the tag info (only for vorbis,flac)"
+#echo "-R     Add replaygain values to the tag info (only for vorbis,flac,mp3)"
 echo "-s <field>"
 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"
@@ -70,6 +72,25 @@ echo ""
 #echo "Double hyphens are used to concatenate tracks"
 }
 
+addstatus ()
+{
+	echo "$@" >> "$ABCDETEMPDIR/status"
+}
+
+# log [level] [message]
+# 
+# log outputs the right message in a common format
+log ()
+{
+	BLURB="$1"
+	shift
+	case $BLURB in
+		error)   echo "[ERR] abcde: $@" >&2 ;;
+		warning) echo "[WAR] $@" >&2 ;;
+		info)    echo "[INF] $@" ;;
+	esac
+}
+
 # Funtions to replace the need of seq, which is too distribution dependant.
 f_seq_row ()
 {
@@ -92,7 +113,7 @@ f_seq_line ()
 		done
 		echo
 	else
-		echo "abcde: syntax error while processing track numbers" >&2
+		log error "syntax error while processing track numbers"
 		exit 1
 	fi
 }
@@ -347,7 +368,6 @@ do_replaygain()
 	if checkstatus replaygain; then :; else
 		run_command "" echo "Adding replygain information..."
 		for OUTPUT in $( echo $OUTPUTTYPE | tr , \ )
-		# THE OUTPUT NEEDS TO BE CORRECTED WITH THE CONTAINER?
 		do
 			case $OUTPUT in
 				vorbis|ogg)
@@ -368,23 +388,26 @@ 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"
 			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"
 					;;
 				*);;
 			esac
 		done
-		if checkerrors replaygain-.{3,6}; then :; else
+		if checkerrors "replaygain-.{3,6}"; then :; else
 			run_command replaygain true
 		fi
 	fi
@@ -832,6 +855,8 @@ do_encode ()
 			esac
 			if [ X"$USEPIPES" = "Xy" ]; then
 				RUN_COMMAND=""
+				# We need a way to store the creation of the files when using PIPES
+				RUN_COMMAND_PIPES="run_command encodetrack-$OUTPUT-$1 true"
 			else
 				run_command '' echo "Encoding track $1 of $TRACKS: $TRACKNAME..."
 				RUN_COMMAND="run_command encodetrack-$OUTPUT-$1"
@@ -868,16 +893,15 @@ do_encode ()
 				;;
 			flac)
 				case "$2" in
-	                        %local*%)
+				%local*%)
 					case "$FLACENCODERSYNTAX" in
 					flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER $FLACENCODEROPTS -o "$OUT" "$IN" ;; 
 				        esac
-					;;
-	
-				*)
-					echo -n "DISTMP3:"
-					echo "$DISTMP3 $DISTMP3OPTS $2 $IN $OUT >/dev/null 2>&1"
-					$RUN_COMMAND nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" > /dev/null 2>&1
+						;;
+					*)
+						vecho -n "DISTMP3:"
+						vecho "$DISTMP3 $DISTMP3OPTS $2 $IN $OUT >/dev/null 2>&1"
+						$RUN_COMMAND nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" > /dev/null 2>&1
 					;;
 				esac
 				;;
@@ -907,9 +931,9 @@ do_encode ()
 				;;
 			wav)
 				# In case of wav output we need nothing. Just keep the wavs.
-				run_command encodetrack-$OUTPUT-$1 true
 				;;
 			esac
+			$RUN_COMMAND_PIPES
 		done
 		# Only remove .wav if the encoding succeeded
 		if checkerrors "encodetrack-(.{3,6})-$1"; then :; else
@@ -1313,11 +1337,11 @@ do_discid ()
 		# Make sure there's a CD in there by checking cd-discid's return code
 		if [ ! "$?" = "0" ]; then
 			if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
-				echo "abcde error: cuesheet information from the flac file could not be read." >&2
-				echo "abcde error: Perhaps the flac file does not contain a cuesheet?." >&2
+				log error "cuesheet information from the flac file could not be read."
+				log error "Perhaps the flac file does not contain a cuesheet?."
 				exit 1
 			else
-				echo "abcde error: CD could not be read. Perhaps there's no CD in the drive?" >&2
+				log error "CD could not be read. Perhaps there's no CD in the drive?"
 				exit 1
 			fi
 		fi
@@ -1352,7 +1376,7 @@ do_discid ()
 						CDPARANOIAOUTPUT="$( $CDROMREADER -$CDPARANOIACDROMBUS $CDROM -Q --verbose 2>&1 )"
 						RET=$?
 						if [ ! "$RET" = "0" ];then
-							echo "Warning: Something went wrong while querying the CD... Maybe a DATA CD?"
+							log warning "something went wrong while querying the CD... Maybe a DATA CD?"
 						fi
 						TRACKS="$(echo "$CDPARANOIAOUTPUT" | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ')"
 						CDPARANOIAAUDIOTRACKS="$TRACKS"
@@ -1368,7 +1392,7 @@ do_discid ()
 			TRACKS=$(echo $TRACKINFO | cut -f2 -d' ')
 		fi
 		if echo "$TRACKS" | grep "[[:digit:]]" > /dev/null 2>&1 ;then :;else
-			echo "The disc does not contain any tracks. Giving up..."
+			log info "The disc does not contain any tracks. Giving up..."
 			exit 0
 		fi
 		echo -n "Grabbing entire CD - tracks: "
@@ -1480,9 +1504,9 @@ do_discid ()
 			if $CUEREADER $CUEREADEROPTS > "$ABCDETEMPDIR/$CUEFILE"; then
 				echo cuefile=$CUEFILE >> "$ABCDETEMPDIR/status"
 			else
-				echo "abcde: reading the CUE sheet with mkcue is still considered experimental"
-				echo "abcde: and there was a problem with the CD reading. abcde will continue,"
-				echo "abcde: but consider reporting the problem to the abcde author"
+				log warning "reading the CUE sheet with mkcue is still considered experimental"
+				log warning "and there was a problem with the CD reading. abcde will continue,"
+				log warning "but consider reporting the problem to the abcde author"
 			fi
 		fi
 	fi
@@ -1963,7 +1987,7 @@ do_cddbedit ()
 			/usr/bin/mg "$CDDBDATA"
 		# bomb out
 		else
-			echo "No editor available. Check your EDITOR environment variable." >&2
+			log warning "no editor available. Check your EDITOR environment variable."
 		fi
 		# delete editor backup file if it exists
 		if [ -w "$CDDBDATA~" ]; then
@@ -2114,7 +2138,7 @@ do_cdread ()
 			flac) READTRACKNUMS="$FIRSTTRACK.1-$(($LASTTRACK + 1)).0" ;;
 			cdparanoia) READTRACKNUMS="$FIRSTTRACK-$LASTTRACK" ;;
 			cdda2wav) READTRACKNUMS="$FIRSTTRACK+$LASTRACK" ;;
-			*) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode"
+			*) log error "$CDROMREADERSYNTAX does not support ONETRACK mode"
 			   exit 1 ;;
 		esac
 	else
@@ -2122,7 +2146,7 @@ do_cdread ()
 	fi
 	CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
 	if [ "$USEPIPES" = "y" ]; then
-		TEMPARG="PIPE_$CDROMREADERSYNTAX"
+		TEMPARG="PIPERIPPER_$CDROMREADERSYNTAX"
 		FILEARG="$( eval echo "\$$TEMPARG" )"
 		REDIR=""
 		PIPE_MESSAGE="and encoding "
@@ -2239,7 +2263,10 @@ do_cdspeed ()
 vecho ()
 {
 if [ x"$EXTRAVERBOSE" != "x" ]; then
-	echo $@
+	case $1 in
+		warning) log warning "$@" ;;
+		*) echo "$@" ;;
+	esac
 fi
 }
 
@@ -2249,8 +2276,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
 }
 
@@ -2378,6 +2409,7 @@ METAFLAC=metaflac
 NORMALIZE=normalize-audio
 CDSPEED=eject
 VORBISGAIN=vorbisgain
+MP3GAIN=mp3gain
 MKCUE=mkcue
 MKTOC=cdrdao
 DIFF=diff
@@ -2418,6 +2450,7 @@ MKCUEOPTS=
 MKTOCOPTS=""
 VORBISCOMMENTOPTS="-R"
 METAFLACOPTS="--no-utf8-convert"
+DIFFOPTS=
 
 # Default to one process if -j isn't specified
 MAXPROCS=1
@@ -2484,7 +2517,7 @@ if [ "$HTTPGETOPTS" = "" ] ; then
 		curl) HTTPGETOPTS="-f -s";;
 		fetch)HTTPGETOPTS="-q -o -";;
 		ftp)  HTTPGETOPTS="-q -o -";;
-		*) echo "abcde warning: HTTPGET in non-standard and HTTPGETOPTS are not defined." >&2 ;;
+		*) log warning "HTTPGET in non-standard and HTTPGETOPTS are not defined." ;;
 	esac
 fi
 
@@ -2507,13 +2540,14 @@ 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:bc:C:d:Defghj:klLmMnNo:pPr:Rs: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" ;;
 		A) EXPACTIONS="$OPTARG" ;;
 		b) BATCHNORM=y ;;
-		c) if [ -e "$OPTARG" ] ; then . "$OPTARG" ; else echo "abcde error: config file \"$OPTARG\" cannot be found." >&2 ; exit 1 ; fi ;;
+		B) NOBATCHREPLAYGAIN=y ;;
+		c) if [ -e "$OPTARG" ] ; then . "$OPTARG" ; else log error "config file \"$OPTARG\" cannot be found." ; exit 1 ; fi ;;
 		C) DISCID="${OPTARG#abcde.}" ;;
 		d) CDROM="$OPTARG" ;;
 		D) set -x ;;
@@ -2536,14 +2570,12 @@ while getopts 1a:bc:C:d:Defghj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W:z opt ; do
 		p) PADTRACKS=y ;;
 		P) USEPIPES=y ;;
 		r) REMOTEHOSTS="$OPTARG" ;;
-		R) REPLAYGAIN=y ;;
+		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]"
@@ -2556,7 +2588,7 @@ while getopts 1a:bc:C:d:Defghj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W:z opt ; do
 		W) if echo $OPTARG | grep -q "[[:digit:]]" ; then 
 		     STARTTRACKNUMBER="${OPTARG}01" ; STARTTRACKNUMBERTAG="y" ; COMMENT="CD${OPTARG}"
 		   else
-		     echo "abcde error: argument of -W must be integer"
+		     log error "argument of -W must be integer"
 			 exit 1
 		   fi
 		   ;;
@@ -2577,6 +2609,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
@@ -2584,21 +2619,21 @@ if [ "$ONETRACK" = "y" ]; then
 		flac) ;;
 		cdparanoia) ;;
 		cdda2wav) ;;
-		*) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode"
+		*) log error "$CDROMREADERSYNTAX does not support ONETRACK mode"
 		   exit 1 ;;
 	esac
 	if [ "$BATCHNORM" = "y" ]; then
-		echo "abcde warning: BATCHNORM mode is not compatible with ONETRACK mode. Disabling..."
+		log warning "BATCHNORM mode is not compatible with ONETRACK mode. Disabling..."
 		BATCHNORM=n
 	fi
 	if [ "$NOGAP" = "y" ]; then
-		echo "abcde warning: NOGAP mode is not compatible with ONETRACK mode. Disabling..."
+		log warning "NOGAP mode is not compatible with ONETRACK mode. Disabling..."
 		NOGAP=n
 	fi
 	# It does not matter how many tracks we want. In ONETRACK mode we grab them all
 	# FIXME # allow ranges of tracks to be selected for onetrack ripping
 	if [ $# -gt 0 ]; then
-		vecho "abcde warning: ONETRACK mode selected, grabbing all tracks..."
+		log warning "ONETRACK mode selected, grabbing all tracks..."
 	fi
 else
 	while [ $# -gt 0 ]; do
@@ -2651,7 +2686,7 @@ done
 
 if [ "$DONORMALIZE" = "y" ] && [ "$DOREPLAYGAIN" = "y" ]; then
 	# FIXME # should we abort on error or just inform the user?
-	:
+	log warning "selected both normalize and replaygain actions"
 fi
 
 for SHOWCDDBFIELD in $(echo $SHOWCDDBFIELDS | tr , \ ); do
@@ -2669,18 +2704,18 @@ if [ X"$CDROM" != "X" ] ; then
 	if [ "$CDROMREADERSYNTAX" = "cdda2wav" ] && [ "$NEEDCDROMID" = "y" ] ; then
 		if [ "$OSFLAVOUR" = "FBSD" ]; then
 			if ! echo "$CDROMID" | grep "^[0-9],[0-9],[0-9]$" >/dev/null 2>&1 ; then
-				echo "abcde error: CDROMID not in the right format for $CDROMREADERSYNTAX"
-				echo "Use \"cdrecord -scanbus\" to obtain a adecuate ID an set CDROMID accordingly"
+				log error "CDROMID not in the right format for $CDROMREADERSYNTAX"
+				log error "Use \"cdrecord -scanbus\" to obtain a adecuate ID an set CDROMID accordingly"
 				exit 1
 			fi
 		fi
 	elif [ ! -e "$CDROM" -a X"$DOREAD" = "Xy" ]; then
-		echo "abcde error: CDROM device cannot be found." >&2
+		log error "CDROM device cannot be found."
 		exit 1
 	fi
 # avoid processing if we are not going to hit the CDROM.
 elif [ X"$DOREAD" = "Xy" ]; then
-	echo "abcde error: CDROM has not been defined or cannot be found" >&2
+	log error "CDROM has not been defined or cannot be found"
 	exit 1
 fi
 
@@ -2692,28 +2727,28 @@ fi
 # - anything else?
 if [ X"$USEPIPES" = "Xy" ]; then
 	if [ $(echo "$OUTPUTTYPE" | tr , \  | wc -w ) -gt 1 ]; then
-		echo "abcde error: Unix pipes not compatible with multiple outputs" >&2
+		log error "Unix pipes not compatible with multiple outputs"
 		exit 1
 	fi
 	if [ X"$DONORMALIZE" = "Xy" ]; then
-		echo "abcde error: Unix pipes not compatible with normalizer"
+		log error "Unix pipes not compatible with normalizer"
 		# FIXME # Do we need to exit or shall we just disable the mode?
 		exit 1
 	fi
 	if [ X"$BATCHNORM" = "Xy" ]; then
-		echo "abcde error: Unix pipes not compatible with BATCHNORM encoding"
+		log error "Unix pipes not compatible with BATCHNORM encoding"
 		exit 1
 	fi
 	if [ X"$NOGAP" = "Xy" ]; then
-		echo "abcde error: Unix pipes not compatible with NOGAP encoding"
+		log error "Unix pipes not compatible with NOGAP encoding"
 		exit 1
 	fi
 	if [ X"$DOENCODE" = "Xn" ]; then
-		vecho "Disabling Unix pipes since we are not encoding!"
+		vecho warning "Disabling Unix pipes since we are not encoding!"
 		USEPIPES=n
 	fi
 	if [ X"$LOWDISK" = "Xy" ]; then
-		vecho "abcde error: Unix pipes not compatible with lowdisk algorithm"
+		log error "Unix pipes not compatible with lowdisk algorithm"
 		exit 1
 	fi
 fi
@@ -2724,15 +2759,22 @@ fi
 # - NOGAP lame mode
 if [ X"$LOWDISK" = "Xy" ]; then
 	if [ X"$BATCHNORM" = "Xy" ]; then
-		echo "abcde error: Unix pipes not compatible with BATCHNORM encoding"
+		log error "Unix pipes not compatible with BATCHNORM encoding"
 		exit 1
 	fi
 	if [ X"$NOGAP" = "Xy" ]; then
-		echo "abcde error: Unix pipes not compatible with NOGAP encoding"
+		log error "Unix pipes not compatible with NOGAP encoding"
 		exit 1
 	fi
 fi
 
+# BATCHNORM pre-tests, before we get into serious problems
+# Not compatible with 
+if [ "$BATCHNORM" = "y" ] && [ "$DONORMALIZE" = "n" ]; then
+	vecho warning "Disabling BATCHNORM since we are not normalizing!"
+	BATCHNORM=n
+fi
+
 # Check the encoding format from the ones available in the system, if nothing has been configured in the system.
 if [ X"$OUTPUTTYPE" = "X" ]; then
 	for DEFAULT_OUTPUT in $( echo "$DEFAULT_OUTPUT_BINARIES" | tr , \ ); do
@@ -2745,8 +2787,8 @@ if [ X"$OUTPUTTYPE" = "X" ]; then
 		fi
 	done
 	if [ X"$OUTPUTTYPE" = "X" ]; then
-		echo "abcde error: no encoder found in the PATH" >&2
-		echo "hits: are all dependencies installed? has the \$PATH been modified?" >&2
+		log error "no encoder found in the PATH"
+		log error "hints: are all dependencies installed? has the \$PATH been modified?"
 		exit 1
 	fi
 fi
@@ -2810,18 +2852,18 @@ do
 		vorbis|ogg)
 			[ "$OGGENCODERSYNTAX" = "default" ] && OGGENCODERSYNTAX=oggenc
 			[ "$DOTAG" = "y" ] && NEEDCOMMENTER=y
-			[ "$REPLAYGAIN" = "y" ] && NEEDVORBISGAIN=y
+			[ "$DOREPLAYGAIN" = "y" ] && NEEDVORBISGAIN=y
 			OGGOUTPUTCONTAINER=ogg
 			;;
 		mp3)
 			[ "$MP3ENCODERSYNTAX" = "default" ] && MP3ENCODERSYNTAX=lame
 			[ "$DOTAG" = "y" ] && NEEDTAGGER=y
-			#[ "$NOGAP" = "y" ]
+			[ "$DOREPLAYGAIN" = "y" ] && NEEDMP3GAIN=y
 			;;
 		flac)
 			[ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac
-			[ "$REPLAYGAIN" = "y" ] && NEEDMETAFLAC=y
 			[ "$DOTAG" = "y" ] && NEEDMETAFLAC=y
+			[ "$DOREPLAYGAIN" = "y" ] && NEEDMETAFLAC=y
 			;;
 		spx)
 			[ "$SPEEXENCODERSYNTAX" = "default" ] && SPEEXENCODERSYNTAX=speexenc
@@ -2835,7 +2877,7 @@ do
 			fi
 			KEEPWAVS=move
 			;;
-		*)	echo "abcde error: Invalid OUTPUTTYPE defined" >&2
+		*)	log error "Invalid OUTPUTTYPE defined"
 			exit 1
 			;;
 	esac
@@ -2888,8 +2930,8 @@ case "$FLACENCODERSYNTAX" in
 		FLACENCODER="$FLAC"	
 		# FLAC streams can be encapsulated on a Ogg transport layer
 		if echo "$FLACENCODEROPTS" | egrep -q -- "(^| )--ogg($| )" ;then
-			echo "abcde error: FLAC on an Ogg container is not yet supported" >&2
-			echo "             due to problem with adding comments to such files" >&2
+			log error "FLAC on an Ogg container is not yet supported"
+			log error "due to problem with adding comments to such files"
 			exit 1
 			FLACOUTPUTCONTAINER=ogg
 		else
@@ -2922,7 +2964,7 @@ fi
 
 # Specific for NOGAP is the use of lame. Another encoder fails...
 if [ "$NOGAP" = "y" ] && [ ! "$MP3ENCODER" = "lame" ]; then
-	"abcde warning: the NOGAP option is specific of lame. Deactivating..."
+	log warning "the NOGAP option is specific of lame. Deactivating..."
 	NOGAP=n
 fi
 
@@ -2936,12 +2978,12 @@ esac
 
 # Check if both OGGEOUTPUTCONTAINER and FLACOUTPUTCONTAINER are the same, and differentiante them
 if [ X"$OGGOUTPUTCONTAINER" = "Xogg" ] && [ X"$FLACOUTPUTCONTAINER" = "Xogg" ]; then
-	echo "abcde error: FLAC on an Ogg container is not yet supported" >&2
-	echo "             due to problem with adding comments to such files" >&2
+	log error "FLAC on an Ogg container is not yet supported"
+	log error "due to problem with adding comments to such files"
 	exit 1
 	OGGOUTPUTCONTAINER=ogg.ogg
 	FLACOUTPUTCONTAINER=flac.ogg
-	vecho "abcde warning: modified file endings due to conflicting transport layers in Ogg/Vorbis and Ogg/FLAC"
+	vecho warning "modified file endings due to conflicting transport layers in Ogg/Vorbis and Ogg/FLAC"
 fi
 
 # Clean up nice options (either use '-n NICELEVEL or -NICELEVEL')
@@ -2982,21 +3024,25 @@ if [ X"$CDSPEEDVALUE" != "X" ]; then
 	esac
 fi
 
+###USEPIPESSUPPORT###
+
 # Rippers with USEPIPE support
 # FIXME # Include here all the rippers we can figure out support pipes
-PIPE_cdparanoia="-"
-PIPE_flac="-c "
+PIPERIPPER_cdparanoia="-"
+PIPERIPPER_debug="-"
+PIPERIPPER_flac="-c "
 
 # Encoders with USEPIPE support
 # FIXME # Include here all the encoders we can figure out support pipes
 PIPE_lame="-"
 PIPE_bladeenc="-"
 PIPE_oggenc="-"
+PIPE_flac="-"
 
 # Figure out if we can use pipes with the ripper/encoder combination
 # exit otherwise
 if [ "$USEPIPES" = "y" ]; then
-	PIPERIPPERSVARCHECK="PIPE_${CDROMREADER}"
+	PIPERIPPERSVARCHECK="PIPERIPPER_${CDROMREADERSYNTAX}"
 	case "$OUTPUT" in
 		mp3)
 			PIPEENCODERSVARCHECK="PIPE_$MP3ENCODERSYNTAX" ;;
@@ -3009,16 +3055,20 @@ if [ "$USEPIPES" = "y" ]; then
 		mpc)
 			PIPEENCODERSVARCHECK="PIPE_$MPPENCODER" ;;
 	esac
-	if [ ! -n "$( eval echo "\$$PIPERIPPERSVARCHECK" )" ] ; then
-		echo "abcde error: no support for pipes with given ripper" >&2
-		echo "read the USEPIPES file from the source tarball to get help." >&2
-		echo "On a Debian system, it is under /usr/share/doc/abcde/USEPIPES.gz" >&2
+	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 [ ! -n "$( eval echo "\$$PIPEENCODERSVARCHECK" )" ] ; then
-		echo "abcde error: no support for pipes with given encoder" >&2
-		echo "read the USEPIPES file from the source tarball to help" >&2
-		echo "on a Debian system, read /usr/share/doc/abcde/USEPIPES.gz" >&2
+	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"
 		exit 1;
 	fi
 fi
@@ -3030,16 +3080,16 @@ for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
 	${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
 	${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
 	${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \
-	${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDCUEREADER+$CUEREADER} \
-	${NEEDCUE2DISCID+$CUE2DISCID}
+	${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDMP3GAIN+$MP3GAIN} \
+	${NEEDCUEREADER+$CUEREADER} ${NEEDCUE2DISCID+$CUE2DISCID}
 do
 	# Cut off the command-line options we just added in
 	X=$(echo $X | cut -d' ' -f2)
 	if [ "$(which $X)" = "" ]; then
-		echo "abcde error: $X is not in your path." >&2
+		log error "$X is not in your path." >&2
 		exit 1
 	elif [ ! -x $(which $X) ]; then
-		echo "abcde error: $X is not executable." >&2
+		log error "$X is not executable." >&2
 		exit 1
 	fi
 done
@@ -3050,7 +3100,7 @@ HTTPGET="$HTTPGET $HTTPGETOPTS"
 
 # And last but not least, check if we can diff between files
 if [ -x $(which $DIFF) ]; then :; else
-	vecho "[WAR] Disabling diff since we cannot find it in the \$PATH..."
+	vecho warning "Disabling diff since we cannot find it in the \$PATH..."
 	DIFF=""
 fi
 
@@ -3131,7 +3181,11 @@ fi
 if [ "$ONETRACK" = "y" ]; then 
 	TRACKS="$FIRSTTRACK"
 	if checkstatus readtrack-$FIRSTTRACK; then :; else
-		do_cdread onetrack $FIRSTTRACK $LASTTRACK
+		if [ "$USEPIPES" = "y" ]; then
+			do_cdread onetrack $FIRSTTRACK $LASTTRACK | do_encode $FIRSTTRACK %local0% > /dev/null 2>&1
+		else
+			do_cdread onetrack $FIRSTTRACK $LASTTRACK
+		fi
 	fi
 else
 	for UTRACKNUM in $TRACKQUEUE
@@ -3157,6 +3211,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
@@ -3256,10 +3315,9 @@ if [ "$BATCHNORM" = "y" ] || [ "$NOGAP" = "y" ]; then
 						if checkstatus normalizetrack-$UTRACKNUM; then :; else do_normalize $UTRACKNUM; fi
 					fi
 				done
-			else
-				if checkstatus encodetrack-$LASTTRACK; then :; else do_nogap_encode; fi
-				if checkerrors nogap-encode; then exit 1; fi
 			fi
+			if checkstatus encodetrack-$LASTTRACK; then :; else do_nogap_encode; fi
+			if checkerrors nogap-encode; then exit 1; fi
 		fi
 	fi
 fi
@@ -3408,12 +3466,17 @@ if [ "$DOENCODE" = "y" -a "$USEPIPES" != "y" ]; then
 fi
 # If the above didn't catch the stragglers, this will
 wait
-if [ "$REPLAYGAIN" = "y" ]; then
+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
-	echo "The following commands failed to run:"
+	log error "The following commands failed to run:"
 	cat "$ABCDETEMPDIR/errors"
 	# Don't clean up
 	DOCLEAN=n
@@ -3429,8 +3492,8 @@ if [ "$DOCLEAN" = "y" ] && [ ! "$FORCE" = "y" ]; then
 	decho [ENCODED_FORMATS]
 	decho [MOVED_FORMATS]
 	if [ "$ENCODED_FORMATS" != "$MOVED_FORMATS" ]; then
-		echo "Not all encoded formats have been requested to be moved."
-		echo "Use \"-a clean -f -C $DISCID\" to force the removal of the remaining data."
+		log warning "Not all encoded formats have been requested to be moved."
+		log warning "Use \"-a clean -f -C $DISCID\" to force the removal of the remaining data."
 		DOCLEAN=n
 	fi
 fi