X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/f899a8ece514654f266818b3f1889108a3a6376b..c4df517cf6863efa5b76b2dcce23547bddfa32cb:/abcde

diff --git a/abcde b/abcde
index f9ea19f..03dcfb0 100755
--- a/abcde
+++ b/abcde
@@ -1025,7 +1025,7 @@ do_encode ()
 				TEMPARG="PIPE_$SPEEXENCODER"
 				;;
 			mpc)
-				TEMPARG="PIPE_$MPPENCODER"
+				TEMPARG="PIPE_$MPCENCODER"
 				;;
 			m4a)
 				TEMPARG="PIPE_$AACENCODERSYNTAX"
@@ -1145,12 +1145,9 @@ do_encode ()
 				;;
 			mpc)	
 				# MPP/MP+(Musepack) format (.mpc) is done locally, with inline
-				# tagging.
-				# I tried compiling the mppenc from corecodecs.org and got some
-				# errors, so I have not tried it myself.
-				## FIXME ## Needs some cleanup to determine if an empty tag sent
-				## FIXME ## to the encoder ends up empty.
-				$RUN_COMMAND nice $EFFECTIVE_NICE $MPPENCODER $MPPENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT"
+				# tagging. Uses mpcenc for Musepack SV8 encoding, changed from
+				# Musepack SV7 which used mppenc....
+				$RUN_COMMAND nice $EFFECTIVE_NICE $MPCENCODER $MPCENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT"
 				;;
 			m4a)
 				# Tag the file at encode time, as it can't be done after encoding.
@@ -2400,6 +2397,9 @@ do_cddbstat ()
 						2??)	# Server responded, everything seems OK
 							rc=0
 							;;
+						*)      # unknown error
+							break
+							;;
 					esac
 					;;
 				esac
@@ -3148,7 +3148,7 @@ MP3ENCODERSYNTAX=default
 OGGENCODERSYNTAX=default
 FLACENCODERSYNTAX=default
 SPEEXENCODERSYNTAX=default
-MPPENCODERSYNTAX=default
+MPCENCODERSYNTAX=default
 AACENCODERSYNTAX=default
 NORMALIZERSYNTAX=default
 CUEREADERSYNTAX=default
@@ -3201,12 +3201,11 @@ FLAC=flac
 # speex
 SPEEXENC=speexenc
 # mpp (Musepack)
-MPPENC=mppenc
+MPCENC=mpcenc
 # m4a
 AACENC=faac
 
 ID3=id3
-ID3V2=id3v2
 EYED3=eyeD3
 VORBISCOMMENT=vorbiscomment
 METAFLAC=metaflac
@@ -3253,12 +3252,12 @@ FLACGAINOPTS="--add-replay-gain"
 # speex
 SPEEXENCOPTS=
 # mpc
-MPPENCOPTS=
+MPCENCOPTS=
 # m4a
 AACENCOPTS=
 
 ID3OPTS=
-ID3V2OPTS=
+EYED3OPTS="--set-encoding=utf16-LE"
 CDPARANOIAOPTS=
 CDDA2WAVOPTS=
 DAGRABOPTS=
@@ -3731,7 +3730,7 @@ if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then
 			mp3:*)	MP3ENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
 			flac:*)	FLACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
 			spx:*)	SPEEXENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
-			mpc:*)	MPPENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+			mpc:*)	MPCENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
 			m4a:*)  AACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
 		esac
 	done
@@ -3743,7 +3742,7 @@ if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then
 fi
 
 # If nothing has been specified, use oggenc for oggs and lame for mp3s and flac
-# for flacs and speexenc for speex and mppenc for mpps and faac for m4as
+# for flacs and speexenc for speex and mpcenc for mpcs and faac for m4as
 
 # Getting ready for multiple output changes
 for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
@@ -3771,7 +3770,7 @@ do
 #			[ "$DOREPLAYGAIN" = "y" ] &&
 			;;
 		mpc)
-			[ "$MPPENCODERSYNTAX" = "default" ] && MPPENCODERSYNTAX=mppenc
+			[ "$MPCENCODERSYNTAX" = "default" ] && MPCENCODERSYNTAX=mpcenc
 			[ "$DOREPLAYGAIN" = "y" ] && NEEDMPPGAIN=y
 			;;
 		m4a)
@@ -3855,10 +3854,10 @@ case "$SPEEXENCODERSYNTAX" in
 		SPEEXENCODER="$SPEEXENC"
 		;;
 esac
-case "$MPPENCODERSYNTAX" in
-	mppenc)
-		MPPENCODEROPTS="${MPPENCODEROPTSCLI:-$MPPENCOPTS}"
-		MPPENCODER="$MPPENC"
+case "$MPCENCODERSYNTAX" in
+	mpcenc)
+		MPCENCODEROPTS="${MPCENCODEROPTSCLI:-$MPCENCOPTS}"
+		MPCENCODER="$MPCENC"
 		;;
 esac
 case "$AACENCODERSYNTAX" in
@@ -3874,9 +3873,8 @@ if [ "$ID3TAGV" = "1" ]; then
 	TAGGEROPTS="$ID3OPTS"
 else
 	TAGGER="$EYED3"
-	TAGGEROPTS="$ID3V2OPTS"
+	TAGGEROPTS="$EYED3OPTS"
 	ID3SYNTAX=eyed3
-	TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
 fi
 
 # NOGAP is specific to lame. Other encoders fail ...
@@ -3980,7 +3978,7 @@ if [ "$USEPIPES" = "y" ]; then
 		spx)
 			PIPEENCODERSVARCHECK="PIPE_$SPEEXENCODER" ;;
 		mpc)
-			PIPEENCODERSVARCHECK="PIPE_$MPPENCODER" ;;
+			PIPEENCODERSVARCHECK="PIPE_$MPCENCODER" ;;
 	esac
 	decho "PIPERIPPERSVARCHECK: $( eval echo "\$$PIPERIPPERSVARCHECK" )"
 	if [ "$( eval echo "\$$PIPERIPPERSVARCHECK" )" = "$" ] || \
@@ -4002,7 +4000,7 @@ fi
 
 # Make sure a buncha things exist
 for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
-	$OGGENCODER $FLACENCODER $SPEEXENCODER $MPPENCODER \
+	$OGGENCODER $FLACENCODER $SPEEXENCODER $MPCENCODER \
 	$AACENCODER $CDDBTOOL \
 	${NEEDATOMICPARSLEY+$ATOMICPARSLEY} \
 	${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \