X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/1a76cf3be7684626ea973c8daf5b416ee98e40d8..4760e46538dfd76afdab51da564f92b7902c8b91:/abcde

diff --git a/abcde b/abcde
index 7143871..b2d31d0 100755
--- a/abcde
+++ b/abcde
@@ -15,7 +15,7 @@
 #
 # $Id$
 
-VERSION='2.5.4-UNRELEASED'
+VERSION='2.5.5-UNRELEASED'
 
 usage ()
 {
@@ -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
@@ -3373,6 +3369,8 @@ fi
 if [ "$CDROM" = "" ] ; then
 	if [ -e /dev/cdroms/cdrom0 ]; then
 		CDROM=/dev/cdroms/cdrom0
+	elif [ "$OSFLAVOUR" = "OSX" ] && [[ $(diskutil list) =~ CD_part.*(disk.)$'\n' ]]; then
+		CDROM=/dev/${BASH_REMATCH[1]}
 	elif [ -e /dev/cdrom ]; then
 		CDROM=/dev/cdrom
 	elif [ -e /dev/sr0 ]; then
@@ -3383,8 +3381,6 @@ if [ "$CDROM" = "" ] ; then
 		CDROM=/dev/acd0c
 	elif [ -e /dev/disk1 ]; then
 		CDROM=/dev/disk1
-	elif [ "$OSFLAVOUR" = "OSX" ] && [[ $(diskutil list) =~ CD_part.*(disk.)$'\n' ]]; then
-		CDROM=/dev/${BASH_REMATCH[1]}
 	fi
 fi
 
@@ -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 ...