diff options
Diffstat (limited to 'multimedia/mplayer-share/patches/patch-an')
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-an | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/multimedia/mplayer-share/patches/patch-an b/multimedia/mplayer-share/patches/patch-an index 027895e4ead..3669f83cba2 100644 --- a/multimedia/mplayer-share/patches/patch-an +++ b/multimedia/mplayer-share/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.1 2008/10/20 07:40:00 wiz Exp $ +$NetBSD: patch-an,v 1.2 2009/10/18 22:22:10 ahoka Exp $ ---- stream/vcd_read_fbsd.h.orig 2007-10-07 19:49:26.000000000 +0000 +--- stream/vcd_read_fbsd.h.orig 2008-03-10 20:28:42.000000000 +0100 +++ stream/vcd_read_fbsd.h -@@ -37,9 +37,8 @@ typedef struct mp_vcd_priv_st { +@@ -41,9 +41,8 @@ typedef struct mp_vcd_priv_st { vcd_tocentry entry; #ifdef VCD_NETBSD struct cd_toc_entry entry_data; @@ -10,28 +10,29 @@ $NetBSD: patch-an,v 1.1 2008/10/20 07:40:00 wiz Exp $ - cdsector_t buf; #endif + cdsector_t buf; + struct ioc_toc_header tochdr; } mp_vcd_priv_t; - static inline void -@@ -208,8 +207,8 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem) +@@ -209,8 +208,8 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem) sc.cmd[9] = 1 << 4; // user data only sc.cmd[10] = 0; // no subchannel sc.cmdlen = 12; - sc.databuf = (caddr_t) mem; -- sc.datalen = 2328; +- sc.datalen = VCD_SECTOR_DATA; + sc.databuf = (caddr_t) vcd->buf.data; + sc.datalen = VCD_SECTOR_DATA + 4; // MMC-3 spec says there are 4 extra bytes sc.senselen = sizeof(sc.sense); sc.flags = SCCMD_READ; sc.timeout = 10000; -@@ -226,9 +225,9 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem) +@@ -227,9 +226,9 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem) #else if (pread(vcd->fd,&vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE) != VCD_SECTOR_SIZE) return 0; // EOF? -+#endif - - memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA); --#endif +- +- memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA); + #endif ++ ++ memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA); vcd_inc_msf(vcd); return VCD_SECTOR_DATA; } |