Re: cdparanoia

[Björn Sandell <biorn@dce.chalmers.se>]

On Wed, 4 Sep 2002, Marc Espie wrote:

> On Tue, Sep 03, 2002 at 11:44:40PM +0200, Björn Sandell wrote:
> > 
> > Hi,
> > 
> > Why is cdparanoia sporting type like size16 and size32 when there is
> > nice stuff like int16_t around? Is there some hidden magic going on or
> > should I whip up a patch?
> Nope, no magic.

Good.
 
> No real need for a patch either...

Attached one anyway :-) Forcing users to do obscure stuff like "cc
-Dsize16=short" inte not very nice.

> It might be better to tell the guy who wrote cdparanoia to fix it. 

I checked them out. The newest version, 3.a9.8, does the right thing.

Björn Sandell       DCE/DFS Sysadmin       IT department
Chalmers University of Technology    www.dce.chalmers.se
diff -urN cdparanoia-old/Makefile cdparanoia/Makefile
--- cdparanoia-old/Makefile	Wed Sep  4 10:04:37 2002
+++ cdparanoia/Makefile	Wed Sep  4 09:44:42 2002
@@ -3,9 +3,8 @@
 COMMENT=	"CDDA reading utility with extra data verification features"
 
 DISTNAME=	cdparanoia-III-alpha9.7
-PKGNAME=	cdparanoia-3.a9.7p2
+PKGNAME=	cdparanoia-3.a9.7p3
 CATEGORIES=	audio
-NEED_VERSION=	1.504
 
 HOMEPAGE=	http://www.xiph.org/paranoia/
 
diff -urN cdparanoia-old/patches/patch-interface_cdda_interface_h cdparanoia/patches/patch-interface_cdda_interface_h
--- cdparanoia-old/patches/patch-interface_cdda_interface_h	Thu Jan  1 01:00:00 1970
+++ cdparanoia/patches/patch-interface_cdda_interface_h	Wed Sep  4 09:52:08 2002
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- interface/cdda_interface.h.orig	Wed Aug 18 05:54:13 1999
++++ interface/cdda_interface.h	Wed Sep  4 09:51:46 2002
+@@ -26,7 +26,7 @@
+ typedef struct TOC {	/* structure of table of contents */
+   unsigned char bFlags;
+   unsigned char bTrack;
+-  size32 dwStartSector;
++  uint32_t dwStartSector;
+ } TOC;
+ 
+ /* interface types */
diff -urN cdparanoia-old/patches/patch-paranoia_cdda_paranoia_h cdparanoia/patches/patch-paranoia_cdda_paranoia_h
--- cdparanoia-old/patches/patch-paranoia_cdda_paranoia_h	Thu Jan  1 01:00:00 1970
+++ cdparanoia/patches/patch-paranoia_cdda_paranoia_h	Wed Sep  4 09:49:42 2002
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- paranoia/cdda_paranoia.h.orig	Wed Sep  4 09:48:05 2002
++++ paranoia/cdda_paranoia.h	Wed Sep  4 09:48:52 2002
+@@ -40,7 +40,7 @@ typedef void cdrom_paranoia;
+ extern cdrom_paranoia *paranoia_init(cdrom_drive *d);
+ extern void paranoia_modeset(cdrom_paranoia *p,int mode);
+ extern long paranoia_seek(cdrom_paranoia *p,long seek,int mode);
+-extern size16 *paranoia_read(cdrom_paranoia *p,void(*callback)(long,int));
++extern int16_t *paranoia_read(cdrom_paranoia *p,void(*callback)(long,int));
+ extern void paranoia_free(cdrom_paranoia *p);
+ extern void paranoia_overlapset(cdrom_paranoia *p,long overlap);
+