[Abcde-users] [abcde] r379 committed - Syntax changes required by eyeD3 versions 0.7.0 and greater....

[abcde at googlecode.com]

Revision: 379
Author:   andrew at andrews-corner.org
Date:     Fri Apr 19 16:53:58 2013
Log:      Syntax changes required by eyeD3 versions 0.7.0 and greater.
This breaks tagging for the moment with lesser eyeD3 versions.
Thanks to Jakob.Gruber and ekeihland for notification and patches.
Closes issues 86 and 89.

http://code.google.com/p/abcde/source/detail?r=379

Modified:
  /trunk/abcde

=======================================
--- /trunk/abcde	Sun Apr 14 19:28:15 2013
+++ /trunk/abcde	Fri Apr 19 16:53:58 2013
@@ -827,13 +827,17 @@
  				eyed3)
  					# FIXME # track numbers in mp3 come with 1/10, so we cannot
  					# happily substitute them with $TRACKNUM
+					# FIXME as well! # Older versions of eyeD3 (< 0.7.0) expect
+					# --set-encoding and --set-text-frame so perhaps some version
+					# sniffing would be useful. Might also be better to simply cut
+					# ties with the older eyeD3... Andrew.
  					run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $TAGGER $TAGGEROPTS \
  						--comment=::"$COMMENTOUTPUT" -A "$DALBUM" \
  						-a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
  						-G "$GENREID" -n "${TRACKNUM:-$1}" \
  						${TRACKNUM:+-N "$TRACKS"} \
-						${ENCODING:+--set-encoding="$ENCODING"} \
-						${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
+						${ENCODING:+--encoding="$ENCODING"} \
+						${TPE2:+--text-frame=TPE2:"$TPE2"} \
  						"$ABCDETEMPDIR/track$1.$OUTPUT"
  					;;
  				# FIXME # Still not activated...
@@ -3310,7 +3314,10 @@
  AACENCOPTS=

  ID3OPTS=
-EYED3OPTS="--set-encoding=utf16-LE"
+# FIXME # Older versions of eyeD3 (< 0.7.0) expect --set-encoding=utf16-LE
+# so perhaps some version sniffing would be useful. Or perhaps it might be
+# better to simply cut ties with the older eyeD3... Andrew.
+EYED3OPTS="--encoding utf16"
  CDPARANOIAOPTS=
  CDDA2WAVOPTS=
  DAGRABOPTS=