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

[clinton/abcde.git] / abcde

diff --git a/abcde b/abcde
index f9ea19f..b2d31d0 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -3206,7 +3206,6 @@ MPPENC=mppenc
 AACENC=faac
 
 ID3=id3
 AACENC=faac
 
 ID3=id3

-ID3V2=id3v2

 EYED3=eyeD3
 VORBISCOMMENT=vorbiscomment
 METAFLAC=metaflac
 EYED3=eyeD3
 VORBISCOMMENT=vorbiscomment
 METAFLAC=metaflac


@@ -3258,7 +3257,7 @@ MPPENCOPTS=
 AACENCOPTS=
 
 ID3OPTS=
 AACENCOPTS=
 
 ID3OPTS=

-ID3V2OPTS=
+EYED3OPTS="--set-encoding=utf16-LE"

 CDPARANOIAOPTS=
 CDDA2WAVOPTS=
 DAGRABOPTS=
 CDPARANOIAOPTS=
 CDDA2WAVOPTS=
 DAGRABOPTS=


@@ -3874,9 +3873,8 @@ if [ "$ID3TAGV" = "1" ]; then
        TAGGEROPTS="$ID3OPTS"
 else
        TAGGER="$EYED3"
        TAGGEROPTS="$ID3OPTS"
 else
        TAGGER="$EYED3"

-       TAGGEROPTS="$ID3V2OPTS"
+       TAGGEROPTS="$EYED3OPTS"

        ID3SYNTAX=eyed3
        ID3SYNTAX=eyed3

-       TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"

 fi
 
 # NOGAP is specific to lame. Other encoders fail ...
 fi
 
 # NOGAP is specific to lame. Other encoders fail ...