From c008b56d27dadfc312cead7a0dd7c0c415a693ef Mon Sep 17 00:00:00 2001 From: data Date: Wed, 10 Aug 2005 21:32:37 +0000 Subject: [PATCH] Added last pieces of code to solve the last bugs in Debian BTS git-svn-id: http://abcde.googlecode.com/svn/trunk@87 a0fa61bc-5347-0410-a1a9-7f54aa4e1825 --- abcde | 9 ++++++--- abcde.1 | 4 ++++ abcde.conf | 4 ++++ debian/changelog | 16 ++++++++++++---- debian/copyright | 2 +- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/abcde b/abcde index 7c83716..75c382c 100755 --- a/abcde +++ b/abcde @@ -1137,7 +1137,7 @@ do_discid () cdparanoia|debug) if [ "$WEHAVEACD" = "y" ]; then vecho "Querying the CD for audio tracks..." - CDPARANOIAOUTPUT="$( $CDROMREADER -d $CDROM -Q --verbose 2>&1 )" + CDPARANOIAOUTPUT="$( $CDROMREADER -$CDPARANOIACDROMBUS $CDROM -Q --verbose 2>&1 )" RET=$? if [ ! "$RET" = "0" ];then echo "Warning: Something went wrong while querying the CD... Maybe a DATA CD?" @@ -1912,7 +1912,7 @@ do_cdread () fi case "$CDROMREADERSYNTAX" in cdparanoia) - nice $READNICE $CDROMREADER -d $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;; + nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;; cdda2wav) if [ "$OSFLAVOUR" = "OSX" ] ; then # Hei, we have to unmount the device before running anything like cdda2wav in OSX @@ -1945,7 +1945,7 @@ do_cdread () else false fi ;; - debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] "$FILEARG" $REDIR + debug) nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM -w $UTRACKNUM-[:1] "$FILEARG" $REDIR ;; esac RETURN=$? @@ -2073,6 +2073,9 @@ CDDBUSELOCAL="n" # If using scsi devices, cdda2wav 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" +# If we are using the ide-scsi emulation layer, we need to define a "g" +CDPARANOIACDROMBUS="d" # program paths - defaults to checking your $PATH # mp3 diff --git a/abcde.1 b/abcde.1 index 2787b9d..c340f51 100644 --- a/abcde.1 +++ b/abcde.1 @@ -276,6 +276,10 @@ The default actions to be performed when reading a disc. If set, it points to the CD-Rom device which has to be used for audio extraction. Abcde tries to guess the right device, but it may fail. .TP +.B CDPARANOIACDROMBUS +Defined as "d" when using cdparanoia with an IDE bus and as "g" when using +cdparanoia with the ide-scsi emulation layer. +.TP .B OUTPUTDIR Specifies the directory to place completed tracks/playlists in. .TP diff --git a/abcde.conf b/abcde.conf index 5afae17..84c20ec 100644 --- a/abcde.conf +++ b/abcde.conf @@ -112,6 +112,7 @@ #MD5SUM=md5sum #DISTMP3=distmp3 #VORBISCOMMENT=vorbiscomment +#METAFLAC=metaflac #NORMALIZE=normalize-audio #CDSPEED=eject #VORBISGAIN=vorbisgain @@ -180,6 +181,9 @@ # CD device you want to read from #CDROM=/dev/cdrom +# If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d" +# If we are using the ide-scsi emulation layer, we need to define a "g" +#CDPARANOIACDROMBUS="d" # If you'd like to make a default location that overrides the current # directory for putting mp3's, uncomment this. diff --git a/debian/changelog b/debian/changelog index afbc846..28f7978 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,8 @@ abcde (2.3.0-1) unstable; urgency=low a space (Closes: #147493). * Repared the CD query for the discid code. When failing to read a disc, actually report that there might be no disc in the drive. - * Right now, walk over the different encoders we Depends: in Debian and use - the one available: if a user has a FLAC encoder, abcde will no install + * Right now, walk over the different encoders we Depends: on in Debian and + use the one available: if a user has a FLAC encoder, abcde will no install vorbis-tools, so it will fail to run out of the box (Closes: #321216) * Added CUE support. Still experimental... * Added FLAC on Ogg. Still not activated, since we cannot get comments added @@ -19,8 +19,16 @@ abcde (2.3.0-1) unstable; urgency=low ) * Added a post_read() function to be executed before ejecting the CD. * Typos reported by A Costa corrected (Closes: #311463) - - -- Jesus Climent Tue, 9 Aug 2005 06:12:36 +0300 + * Problem with abcde being run in a directory with files containing only + numbers solved (Closes: #313628). + * vorbiscomment uses now "-R" (Closes: #303566). + * "-t" and "-T" use the first track as a starter for the track list. + (Closes: #305749). + * Added CDPARANOIACDROMBUS option to define -d in case of using IDE and SCSI + in case of using ide-scsi emulation layer (Closes: #290768). + * Define metaflac in abcde.conf (Closes: #303555) + + -- Jesus Climent Wed, 10 Aug 2005 07:00:26 +0300 abcde (2.2.6-1) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index f3ee503..251a451 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,7 +9,7 @@ Original Author: Robert Woodcook Copyright: Copyright (c) 1998-2001 Robert Woodcock -Copyright (c) 2003-2004 Jesus Climent +Copyright (c) 2003-2005 Jesus Climent This code is hereby licensed for public consumption under either the GNU GPL v2 or greater, or Larry Wall's Artistic license - your choice. -- 2.20.1