From: data <data@a0fa61bc-5347-0410-a1a9-7f54aa4e1825>
Date: Thu, 26 Jan 2006 20:56:04 +0000 (+0000)
Subject: Tagged 2.3.99.3
X-Git-Url: https://git.hcoop.net/clinton/abcde.git/commitdiff_plain/3b4d8f9b5214afc50dad321b2393348c8d382d7f?hp=d100b6be9769de4fde85281fd6c8bc96cc7080e8

Tagged 2.3.99.3

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

diff --git a/abcde b/abcde
index 9367555..27779b1 100755
--- a/abcde
+++ b/abcde
@@ -413,15 +413,18 @@ do_replaygain()
 {
 	if checkstatus replaygain; then :; else
 		run_command "" echo "Adding replygain information..."
-		for OUTPUT in $( echo $OUTPUTTYPE | tr , \ )
+		for TMPOUTPUT in $( echo $OUTPUTTYPE | tr , \ )
 		do
-			case $OUTPUT in
+			case $TMPOUTPUT in
 				vorbis|ogg)
 					OUTPUT=$OGGOUTPUTCONTAINER
 					;;
 				flac)
 					OUTPUT=$FLACOUTPUTCONTAINER
 					;;
+				*)
+					OUTPUT=$TMPOUTPUT
+					;;
 			esac
 			OUTPUTFILES=""
 			REPLAYINDEX=0
@@ -894,9 +897,9 @@ do_encode ()
 	fi
 	# We need IN to proceed, if we are not using pipes.
 	if [ -s "$IN" -o X"$USEPIPES" = "Xy" ] ; then
-		for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
+		for TMPOUTPUT in $(echo $OUTPUTTYPE | tr , \ )
 		do
-			case "$OUTPUT" in
+			case "$TMPOUTPUT" in
 				vorbis|ogg)
 					OUT="$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"
 					OUTPUT=$OGGOUTPUTCONTAINER
@@ -907,6 +910,7 @@ do_encode ()
 					;;
 				*)
 					OUT="$ABCDETEMPDIR/track$1.$OUTPUT"
+					OUTPUT=$TMPOUTPUT
 					;;
 			esac
 			if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then 
@@ -1292,15 +1296,18 @@ do_move ()
 # VARIOUSARTISTS, OUTPUTDIR
 do_playlist ()
 {
-	for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
+	for TMPOUTPUT in $(echo $OUTPUTTYPE | tr , \ )
 	do
-		case $OUTPUT in
+		case $TMPOUTPUT in
 			vorbis|ogg)
 				OUTPUT=$OGGOUTPUTCONTAINER
 				;;
 			flac)
 				OUTPUT=$FLACOUTPUTCONTAINER
 				;;
+			*)
+				OUTPUT=$TMPOUTPUT
+				;;
 		esac
 		# Create a playlist file for the playlist data to go into.
 		# We used to wipe it out if it existed. Now we request permision if interactive.