Date: Wed, 5 Nov 2003 20:47:29 +0600 From: Max Khon <fjoe@iclub.nsu.ru> To: Simon Barner <barner@in.tum.de> Cc: gerald@freebsd.org Subject: Re: PRs for dagrab and cdparanoia reworked (was: Re: Fix for WINE on -CURRENT) Message-ID: <20031105144729.GA14918@iclub.nsu.ru> In-Reply-To: <20031105131002.GC411@zi025.glhnet.mhn.de> References: <200311040514.hA45E3Hk065630@WBIw009.westbend.net> <20031105035310.GB94240@iclub.nsu.ru> <20031105045035.GB3240@zi025.glhnet.mhn.de> <20031105095142.GA6690@iclub.nsu.ru> <20031105131002.GC411@zi025.glhnet.mhn.de>
next in thread | previous in thread | raw e-mail | index | archive | help
--Q68bSM7Ycu6FN28Q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello! On Wed, Nov 05, 2003 at 02:10:02PM +0100, Simon Barner wrote: > > please revise the patch and submit follow-up. > > Done. Tested on both -STABLE and -CURRENT. > > I am progress of doing the same for dagrab (expect a follow-up to PR > 57227 soon). There is no need for extra-patches. #ifdef CDIOCREADAUDIO seems to be sufficient enough. Is using CDRIOCSETBLOCKSIZE necessary as well? If yes it shouold be done in enable_cdda callback I think. Moreover, is there a reason we should use CDIOCREADAUDIO on RELENG_4? Please test attached patch. works for me on RELENG_4 and should work on -CURRENT as well. /fjoe --Q68bSM7Ycu6FN28Q Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="cdparanoia.diff" Index: Makefile =================================================================== RCS file: /home/pcvs/ports/audio/cdparanoia/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- Makefile 14 Jul 2003 02:52:55 -0000 1.8 +++ Makefile 5 Nov 2003 14:05:27 -0000 @@ -7,7 +7,7 @@ PORTNAME= cdparanoia PORTVERSION= 3.9.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio sysutils MASTER_SITES= http://www.xiph.org/paranoia/download/ DISTNAME= ${PORTNAME}-${PORTVERSION:C/^3\./III-alpha/} Index: files/patch-interface-cooked_interface.c =================================================================== RCS file: /home/pcvs/ports/audio/cdparanoia/files/patch-interface-cooked_interface.c,v retrieving revision 1.2 diff -u -p -r1.2 patch-interface-cooked_interface.c --- files/patch-interface-cooked_interface.c 11 Jan 2003 09:15:00 -0000 1.2 +++ files/patch-interface-cooked_interface.c 5 Nov 2003 14:38:09 -0000 @@ -1,11 +1,5 @@ -Index: interface/cooked_interface.c -=================================================================== -RCS file: /home/cvs/cdparanoia/interface/cooked_interface.c,v -retrieving revision 1.1.1.1 -retrieving revision 1.8 -diff -u -r1.1.1.1 -r1.8 ---- interface/cooked_interface.c 2003/01/05 09:46:26 1.1.1.1 -+++ interface/cooked_interface.c 2003/01/11 08:58:45 1.8 +--- interface/cooked_interface.c.orig Thu Apr 20 05:41:04 2000 ++++ interface/cooked_interface.c Wed Nov 5 20:37:44 2003 @@ -1,6 +1,8 @@ /****************************************************************** * CopyPolicy: GNU Public License 2 applies @@ -23,7 +17,7 @@ diff -u -r1.1.1.1 -r1.8 static int cooked_readtoc (cdrom_drive *d){ int i; int tracks; -@@ -129,6 +132,128 @@ +@@ -129,6 +132,120 @@ return(sectors); } @@ -96,18 +90,10 @@ diff -u -r1.1.1.1 -r1.8 +cooked_read(cdrom_drive *d, void *p, long begin, long sectors) +{ + int retry_count = 0; -+ struct ioc_read_audio arg; -+ -+ if (sectors > d->nsectors) -+ sectors = d->nsectors; -+ -+ arg.address_format = CD_LBA_FORMAT; -+ arg.address.lba = begin; -+ arg.buffer = p; ++ int bsize = CD_FRAMESIZE_RAW; + + for (;;) { -+ arg.nframes = sectors; -+ if (ioctl(d->ioctl_fd, CDIOCREADAUDIO, &arg) == -1) { ++ if (pread(d->ioctl_fd, p, sectors*bsize, begin*bsize) != sectors*bsize) { + if (!d->error_retry) + return -7; + @@ -152,7 +138,7 @@ diff -u -r1.1.1.1 -r1.8 /* hook */ static int Dummy (cdrom_drive *d,int Switch){ return(0); -@@ -193,6 +318,7 @@ +@@ -193,6 +310,7 @@ int cooked_init_drive (cdrom_drive *d){ int ret; @@ -160,7 +146,7 @@ diff -u -r1.1.1.1 -r1.8 switch(d->drive_type){ case MATSUSHITA_CDROM_MAJOR: /* sbpcd 1 */ case MATSUSHITA_CDROM2_MAJOR: /* sbpcd 2 */ -@@ -243,6 +369,9 @@ +@@ -243,6 +361,9 @@ default: d->nsectors=40; } --Q68bSM7Ycu6FN28Q--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031105144729.GA14918>