* Clean up movement to eyeD3, remove id3v2 remnants. Thanks to vskytta

[clinton/abcde.git] / abcde

diff --git a/abcde b/abcde
index edbc78c..b2d31d0 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -3206,7 +3206,6 @@ MPPENC=mppenc
 AACENC=faac
 
 ID3=id3
-ID3V2=id3v2
 EYED3=eyeD3
 VORBISCOMMENT=vorbiscomment
 METAFLAC=metaflac
@@ -3258,7 +3257,7 @@ MPPENCOPTS=
 AACENCOPTS=
 
 ID3OPTS=
-ID3V2OPTS=
+EYED3OPTS="--set-encoding=utf16-LE"
 CDPARANOIAOPTS=
 CDDA2WAVOPTS=
 DAGRABOPTS=
@@ -3326,10 +3325,7 @@ else
 fi
 
 # If CDDBAVAIL is set to n, no CDDB read is done
-# If USEID3 is set to n, no ID3 tagging is done
 CDDBAVAIL=y
-USEID3=y
-USEID3V2=y
 
 # There we go..
 # But before we get into business, let us chop off any GREP environmental
@@ -3877,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 ...