Attachment 37368 Details for Bug 59514 – xmms-cdread.diff

[patch] xmms-cdread.diff

xmms-cdread.diff (text/plain), 1.66 KB, created by Sergey V. Belov on 2003-11-20 16:10:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey V. Belov

Created: 2003-11-20 16:10:17 UTC

Size: 1.66 KB

patch

obsolete

>diff -ruN xmms-cdread.bak/files/patch-cdrombsd.h xmms-cdread/files/patch-cdrombsd.h
>--- xmms-cdread.bak/files/patch-cdrombsd.h	Sun Mar 23 11:51:47 2003
>+++ xmms-cdread/files/patch-cdrombsd.h	Thu Nov 20 19:25:03 2003
>@@ -1,6 +1,16 @@
>---- cdrombsd.h.orig	Sat Aug 18 19:09:10 2001
>-+++ cdrombsd.h	Sun Mar 23 16:35:33 2003
>-@@ -9,12 +9,9 @@
>+--- cdrombsd.h.orig	Sat Aug 18 15:09:10 2001
>++++ cdrombsd.h	Thu Nov 20 19:24:05 2003
>+@@ -5,15 +5,19 @@
>+ #ifndef CDROMBSD_H
>+ #define CDROMBSD_H
>+ #include <sys/param.h>
>++#if __FreeBSD_version >= 501106
>++#include <sys/cdrio.h>
>++#ifndef CD_FRAMESIZE_RAW
>++#define CD_FRAMESIZE_RAW 2352
>++#endif
>++#endif
>+ /*\
>  |*| FreeBSD (?) specific code
>  \*/
>  
>@@ -9,10 +19,34 @@
> -					((entry.addr.msf.minute * 60 + \
> -					entry.addr.msf.second) * 75 + \
> -					entry.addr.msf.frame))
>--
> +#define GET_LBA(entry) ((entry.addr.msf.minute * 60 \
> +			+ entry.addr.msf.second) * 75 \
> +			+ entry.addr.msf.frame)
>  
>+ 
>  /*\
>- |*| Open cdrom device
>+@@ -84,6 +88,16 @@
>+ |*|  from device cdfd, at position lba
>+ |*|  Return number of successfully read frames, -1 on error.
>+ \*/
>++#if __FreeBSD_version >= 501106
>++static int
>++cdrom_read_audio(int cdfd, int lba, char *buf, int btw)
>++{
>++	int bsize = CD_FRAMESIZE_RAW;
>++	if (ioctl(cdfd, CDRIOCSETBLOCKSIZE, &bsize) == -1) return -errno;
>++	if (pread(cdfd, buf, btw*bsize, (lba - 150)*bsize) != btw*bsize) return 0;
>++	return btw; 
>++}
>++#else // 4-STABLE
>+ static int
>+ cdrom_read_audio(int cdfd, int lba, char *buf, int btw)
>+ {
>+@@ -101,6 +115,7 @@
>+ 	} while (--rtr >= 0);
>+ 	return -1;
>+ }
>++#endif // FreeBSD_version
>+ 
>+ /*\ Play audio from lba address from, to lba address to
>+ |*|  return -1 on failure

Actions: View | Diff

Attachments on bug 59514: 37368