Mercurial > mplayer.hg

changeset 23856:07d30c4c81b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
READ_TOC for making *BSD code more similar
author reimar
date Fri, 27 Jul 2007 17:18:03 +0000
parents 30c690e359c2
children d5223bab4b92
files stream/vcd_read_fbsd.h stream/vcd_read_nbsd.h
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/stream/vcd_read_fbsd.h	Fri Jul 27 17:12:21 2007 +0000
+++ b/stream/vcd_read_fbsd.h	Fri Jul 27 17:18:03 2007 +0000
@@ -4,6 +4,7 @@
 //=================== VideoCD ==========================
 #define	CDROM_LEADOUT	0xAA
 #define TOCADDR(te) ((te).entry.addr)
+#define READ_TOC CDIOREADTOCENTRY
 
 typedef struct {
 	uint8_t sync            [12];
@@ -56,7 +57,7 @@
 {
   vcd->entry.address_format = CD_MSF_FORMAT;
   vcd->entry.track  = track;
-  if (ioctl(vcd->fd, CDIOREADTOCENTRY, &vcd->entry)) {
+  if (ioctl(vcd->fd, READ_TOC, &vcd->entry)) {
     mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif1: %s\n",strerror(errno));
     return -1;
   }
@@ -73,7 +74,7 @@
   }
   vcd->entry.address_format = CD_MSF_FORMAT;
   vcd->entry.track  = track<tochdr.ending_track?(track+1):CDROM_LEADOUT;
-  if (ioctl(vcd->fd, CDIOREADTOCENTRY, &vcd->entry)) {
+  if (ioctl(vcd->fd, READ_TOC, &vcd->entry)) {
     mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif2: %s\n",strerror(errno));
     return -1;
   }
@@ -98,7 +99,7 @@
     tocentry.track  = i<=tochdr.ending_track ? i : CDROM_LEADOUT;
     tocentry.address_format = CD_MSF_FORMAT;
 
-    if (ioctl(fd, CDIOREADTOCENTRY, &tocentry) == -1) {
+    if (ioctl(fd, READ_TOC, &tocentry) == -1) {
       mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc entry: %s\n",strerror(errno));
       return NULL;
     }
--- a/stream/vcd_read_nbsd.h	Fri Jul 27 17:12:21 2007 +0000
+++ b/stream/vcd_read_nbsd.h	Fri Jul 27 17:18:03 2007 +0000
@@ -7,6 +7,7 @@
 
 #define	CDROM_LEADOUT	0xAA
 #define TOCADDR(te) ((te).data->addr)
+#define READ_TOC CDIOREADTOCENTRYS
 
 typedef struct mp_vcd_priv_st {
   int fd;
@@ -56,7 +57,7 @@
   vcd->entry.starting_track = track;
   vcd->entry.data_len = sizeof(struct cd_toc_entry);
   vcd->entry.data = &vcd->entry_data;
-  if (ioctl(vcd->fd, CDIOREADTOCENTRIES, &vcd->entry)) {
+  if (ioctl(vcd->fd, READ_TOC, &vcd->entry)) {
     mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif1: %s\n",strerror(errno));
     return -1;
   }
@@ -75,7 +76,7 @@
   vcd->entry.starting_track = track < tochdr.ending_track ? (track + 1) : CDROM_LEADOUT;
   vcd->entry.data_len = sizeof(struct cd_toc_entry);
   vcd->entry.data = &vcd->entry_data;
-  if (ioctl(vcd->fd, CDIOREADTOCENTRYS, &vcd->entry)) {
+  if (ioctl(vcd->fd, READ_TOC, &vcd->entry)) {
     mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif2: %s\n",strerror(errno));
     return -1;
   }
@@ -103,7 +104,7 @@
     tocentry.data_len = sizeof(struct cd_toc_entry);
     tocentry.data = &tocentry_data;
 
-    if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry) == -1) {
+    if (ioctl(fd, READ_TOC, &tocentry) == -1) {
       mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc entry: %s\n",strerror(errno));
       return NULL;
     }