From 1ef3eda68b6715345e36e5299d14352f27b74890 Mon Sep 17 00:00:00 2001 From: "andrew@andrews-corner.org" Date: Fri, 19 Apr 2013 23:53:58 +0000 Subject: [PATCH] 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. git-svn-id: http://abcde.googlecode.com/svn/trunk@379 a0fa61bc-5347-0410-a1a9-7f54aa4e1825 --- abcde | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/abcde b/abcde index ababbd3..6b07ddd 100755 --- a/abcde +++ b/abcde @@ -827,13 +827,17 @@ do_tag () 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 @@ MPCENCOPTS= 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= -- 2.20.1