Mercurial > mplayer.hg
diff stream/vcd_read_nbsd.h @ 23856:07d30c4c81b8
READ_TOC for making *BSD code more similar
author | reimar |
---|---|
date | Fri, 27 Jul 2007 17:18:03 +0000 |
parents | 3522fdbd3d2a |
children |
line wrap: on
line diff
--- 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; }