HCoop
/
clinton
/
abcde.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Clean up movement to eyeD3, remove id3v2 remnants. Thanks to vskytta
[clinton/abcde.git]
/
abcde
diff --git
a/abcde
b/abcde
index
7143871
..
b2d31d0
100755
(executable)
--- a/
abcde
+++ b/
abcde
@@
-15,7
+15,7
@@
#
# $Id$
#
# $Id$
-VERSION='2.5.
4
-UNRELEASED'
+VERSION='2.5.
5
-UNRELEASED'
usage ()
{
usage ()
{
@@
-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=
@@
-3326,10
+3325,7
@@
else
fi
# If CDDBAVAIL is set to n, no CDDB read is done
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
CDDBAVAIL=y
-USEID3=y
-USEID3V2=y
# There we go..
# But before we get into business, let us chop off any GREP environmental
# 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
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
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
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
fi
fi
@@
-3877,9
+3873,8
@@
if [ "$ID3TAGV" = "1" ]; then
TAGGEROPTS="$ID3OPTS"
else
TAGGER="$EYED3"
TAGGEROPTS="$ID3OPTS"
else
TAGGER="$EYED3"
- TAGGEROPTS="$
ID3V2
OPTS"
+ TAGGEROPTS="$
EYED3
OPTS"
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 ...