X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/18f6490f2500a43feb946032a0a8e49eb6a241f5..6fa498738fe5609bdf9d74d9ab48066bb51e8f05:/abcde

diff --git a/abcde b/abcde
index f9bc8ee..c011a51 100755
--- a/abcde
+++ b/abcde
@@ -15,7 +15,7 @@
 #
 # $Id$
 
-VERSION='2.5.3'
+VERSION='2.5.5-UNRELEASED'
 
 usage ()
 {
@@ -828,9 +828,9 @@ do_tag ()
 						--comment=::"$COMMENTOUTPUT" -A "$DALBUM" \
 						-a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
 						-G "$GENREID" -n "${TRACKNUM:-$1}" \
-						"${TRACKNUM:+-N $TRACKS}" \
-						"${ENCODING:+--set-encoding=$ENCODING}" \
-						"${TPE2:+--set-user-text-frame=TPE2:$TPE2}" \
+						${TRACKNUM:+-N "$TRACKS"} \
+						${ENCODING:+--set-encoding="$ENCODING"} \
+						${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
 						"$ABCDETEMPDIR/track$1.$OUTPUT"
 					;;
 				# FIXME # Still not activated...
@@ -3876,8 +3876,10 @@ if [ "$ID3TAGV" = "1" ]; then
 	TAGGER="$ID3"
 	TAGGEROPTS="$ID3OPTS"
 else
-	TAGGER="$ID3V2"
+	TAGGER="$EYED3"
 	TAGGEROPTS="$ID3V2OPTS"
+	ID3SYNTAX=eyed3
+	TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
 fi
 
 # NOGAP is specific to lame. Other encoders fail ...