From 6b005b854015724bd83597e14d4809fb35f43bac Mon Sep 17 00:00:00 2001 From: colintu Date: Fri, 16 Oct 2009 19:02:54 +0000 Subject: [PATCH] Replace dependency on cdda2wav with icedax since the former has been superseded. git-svn-id: http://abcde.googlecode.com/svn/trunk@273 a0fa61bc-5347-0410-a1a9-7f54aa4e1825 --- FAQ | 6 +++--- README | 2 +- abcde | 22 +++++++++++----------- abcde.1 | 3 ++- abcde.conf | 4 ++-- changelog | 4 +++- debian/changelog | 4 +++- debian/control | 2 +- 8 files changed, 26 insertions(+), 21 deletions(-) diff --git a/FAQ b/FAQ index d6b2341..419139b 100644 --- a/FAQ +++ b/FAQ @@ -250,9 +250,9 @@ A. Well, I have a Mac, but I use linux on it. I have not been able to find a way to make it work there, since I do not have the development tools installed. I have placed a basic support, but some user reports are just complaining about abcde not encoding the ripped tracks, as if - cdda2wav/cdparanoia/cddafs would never end reading them. If you have such - a system and experience problems, please, report them, and I will try to - work them out with your help. + icedax/cdda2wav/cdparanoia/cddafs would never end reading them. If you have + such a system and experience problems, please, report them, and I will + try to work them out with your help. Q. My hardware player (put it here) does not recognize the playlists created with abcde. What I am doing wrong? diff --git a/README b/README index 2045b6b..985e924 100644 --- a/README +++ b/README @@ -207,7 +207,7 @@ abcde requires the following backend tools to work: * AAC encoder (faac) * normalize-audio for volume normalization. * CD Paranoia, an audio CD reading utility or: -* cdda2wav, the audio CD reading utility cdparanoia was born from or: +* icedax/cdda2wav, the audio CD reading utility cdparanoia was born from or: * dagrab, another audio CD reading utility. * cd-discid, a CDDB DiscID reading program. Formerly bundled with abcde. It's available in Debian or http://linukz.org/cd-discid.shtml diff --git a/abcde b/abcde index 42df12d..2e76551 100755 --- a/abcde +++ b/abcde @@ -2715,7 +2715,7 @@ do_cdread () # FIXME # Add the possibility of grabbing ranges of tracks in onetrack # FIXME # Until then, we grab the whole CD in one track, no matter what # the user said - # We need the first and last track for cdda2wav + # We need the first and last track for cdda2wav/icedax FIRSTTRACK=$2 LASTTRACK=$(expr $3 + 0) UTRACKNUM=$FIRSTTRACK @@ -2725,7 +2725,7 @@ do_cdread () #XX FIXME XX # Add a variable to check if tracks are provided in command line and if not, use "0-" to rip the tracks READTRACKNUMS="$FIRSTTRACK-$LASTTRACK" ;; - cdda2wav) READTRACKNUMS="$FIRSTTRACK+$LASTTRACK" ;; + cdda2wav | icedax) READTRACKNUMS="$FIRSTTRACK+$LASTTRACK" ;; *) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode" exit 1 ;; esac @@ -2778,11 +2778,11 @@ do_cdread () nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" fi;; - cdda2wav) + cdda2wav | icedax) if [ "$OSFLAVOUR" = "OSX" ] ; then - # Hei, we have to unmount the device before running anything like cdda2wav in OSX + # Hei, we have to unmount the device before running anything like cdda2wav/icedax in OSX disktool -u ${CDROM#/dev/} 0 - # Also, in OSX the cdrom device for cdda2wav changes... + # Also, in OSX the cdrom device for cdda2wav/icedax changes... CDDA2WAVCDROM="IODVDServices" elif [ "$OSFLAVOUR" = "FBSD" ] ; then CDDA2WAVCDROM="$CDROMID" @@ -2990,7 +2990,7 @@ NOGAP=n BATCHNORM=n NOCDDBQUERY=n -# If using scsi devices, cdda2wav needs a CDROMID, instead of a device node +# If using scsi devices, cdda2wav/icedax needs a CDROMID, instead of a device node # i.e. CDROMID="1,0,0" CDROMID="" # If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d" @@ -3026,7 +3026,7 @@ METAFLAC=metaflac AACTAG=faac CDPARANOIA=cdparanoia -CDDA2WAV=cdda2wav +CDDA2WAV=icedax DAGRAB=dagrab CDDAFS=cp CDDISCID=cd-discid @@ -3095,7 +3095,7 @@ ACTIONS=cddb,read,encode,tag,move,clean DEFAULT_OUTPUT_BINARIES=vorbis:oggenc,flac:flac,mp3:toolame,mp3:lame,mp3:bladeenc,spx:speex,m4a:faac # List of prefered cdromreaders - by default, run whichever we have in the path -DEFAULT_CDROMREADERS="cdparanoia cdda2wav" +DEFAULT_CDROMREADERS="cdparanoia icedax cdda2wav" # List of quality levels associated with the encoders: DEFAULT_QUALITY_XLO="oggenc:-q -1,lame:-q 9,speex:--quality 1,m4a:" @@ -3308,7 +3308,7 @@ if [ "$ONETRACK" = "y" ]; then case "$CDROMREADERSYNTAX" in flac) ;; cdparanoia) ;; - cdda2wav) ;; + cdda2wav | icedax) ;; *) log error "$CDROMREADERSYNTAX does not support ONETRACK mode" exit 1 ;; esac @@ -3396,7 +3396,7 @@ done # At this point a CDROM has to be defined, so we check it exists. if [ X"$CDROM" != "X" ] ; then - if [ "$CDROMREADERSYNTAX" = "cdda2wav" ] && [ "$NEEDCDROMID" = "y" ] ; then + if ( [ "$CDROMREADERSYNTAX" = "cdda2wav" ] || [ "$CDROMREADERSYNTAX" = "icedax" ] ) && [ "$NEEDCDROMID" = "y" ] ; then if [ "$OSFLAVOUR" = "FBSD" ]; then if echo "$CDROMID" | grep "^[0-9],[0-9],[0-9]$" >/dev/null 2>&1 ; then :; else log error "CDROMID not in the right format for $CDROMREADERSYNTAX" @@ -3494,7 +3494,7 @@ case "$CDROMREADERSYNTAX" in CDROMREADER="$CDPARANOIA" CDROMREADEROPTS="$CDPARANOIAOPTS" ;; - cdda2wav) + cdda2wav | icedax) CDROMREADER="$CDDA2WAV" CDROMREADEROPTS="$CDDA2WAVOPTS" ;; diff --git a/abcde.1 b/abcde.1 index 9cd3102..cb4088f 100644 --- a/abcde.1 +++ b/abcde.1 @@ -548,7 +548,7 @@ abcde requires the following backend tools to work: An Ogg/Vorbis, MP3, FLAC, Ogg/Speex, MPP/MP+(Musepack) or M4A encoder (oggenc, vorbize, lame, gogo, bladeenc, l3enc, mp3enc, flac, speexenc, mppenc, faac) .TP .B * -An audio CD reading utility (cdparanoia, cdda2wav, dagrab) +An audio CD reading utility (cdparanoia, icedax, cdda2wav, dagrab) .TP .B * cd-discid, a CDDB DiscID reading program. @@ -572,6 +572,7 @@ An HTTP retrieval program: wget, fetch (FreeBSD) or curl (Mac OS X, among others (optional) mkcue, a CD cuesheet extractor. .SH "SEE ALSO" .BR cdparanoia (1), +.BR icedax (1), .BR cdda2wav (1), .BR dagrab (1), .BR normalize-audio (1), diff --git a/abcde.conf b/abcde.conf index aa4558f..362b374 100644 --- a/abcde.conf +++ b/abcde.conf @@ -74,7 +74,7 @@ #NORMALIZERSYNTAX=default # CD reader program to use - currently recognized options are 'cdparanoia', -# 'cdda2wav', 'dagrab', 'cddafs' (Mac OS X only) and 'flac'. +# 'icedax', 'cdda2wav', 'dagrab', 'cddafs' (Mac OS X only) and 'flac'. #CDROMREADERSYNTAX=cdparanoia # CUE reader syntax for the CUE reader program to use. @@ -130,7 +130,7 @@ #ID3=id3 #ID3V2=id3v2 #CDPARANOIA=cdparanoia -#CDDA2WAV=cdda2wav +#CDDA2WAV=icedax #CDDAFS=cp #CDDISCID=cd-discid #CDDBTOOL=cddb-tool diff --git a/changelog b/changelog index fcf416b..2dc1027 100644 --- a/changelog +++ b/changelog @@ -6,8 +6,10 @@ abcde 2.4 * Added TPE2 for Various artists definition (Closes: #521669). * Incorporate syntax error fix patch from Andrew Ruder. * Fix formatting for track number tagging. + * Replace dependency on cdda2wav with icedax since the former has + been superseded. - -- Jesus Climent Wed, 12 Aug 2009 07:56:21 +0100 + -- Colin Tuckley Fri, 16 Oct 2009 19:33:33 +0100 abcde 2.3.99.8 diff --git a/debian/changelog b/debian/changelog index 5967b81..02d90d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ abcde (2.4-1) unstable; urgency=low [ Colin Tuckley ] * Incorporate syntax error fix patch from Andrew Ruder. * Fix formatting for track number tagging (Closes: #520367, #435665). + * Replace dependency on cdda2wav with icedax since the former has + been superseded (Closes: #447397). - -- Colin Tuckley Wed, 14 Oct 2009 17:13:10 +0100 + -- Colin Tuckley Fri, 16 Oct 2009 19:33:33 +0100 abcde (2.3.99.8-1) unstable; urgency=low diff --git a/debian/control b/debian/control index bd3dd3c..7f59698 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Vcs-Svn: http://abcde.googlecode.com/svn/trunk/ Package: abcde Architecture: all -Depends: cd-discid, wget, cdparanoia | cdda2wav, vorbis-tools (>= 1.0beta4-1) | lame | flac | bladeenc | speex +Depends: cd-discid, wget, cdparanoia | icedax, vorbis-tools (>= 1.0beta4-1) | lame | flac | bladeenc | speex Recommends: vorbis-tools Suggests: eject, distmp3, id3 (>= 0.12), id3v2, eyed3, normalize-audio, vorbisgain, mkcue, mp3gain, python-musicbrainz Description: A Better CD Encoder -- 2.20.1