cosmetics: move WIN32 read_toc code to allow for summarizing more common

code of the other variants.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20602 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-11-01 19:57:44 +00:00
parent 1c714fb0ca
commit 9b50176ab6
1 changed files with 24 additions and 22 deletions

View File

@ -66,6 +66,29 @@ int
read_toc(const char *dev) { read_toc(const char *dev) {
int first, last; int first, last;
int i; int i;
#ifdef WIN32
HANDLE drive;
DWORD r;
CDROM_TOC toc;
char device[10];
sprintf(device, "\\\\.\\%s", dev);
drive = CreateFile(device, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
if(!DeviceIoControl(drive, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(CDROM_TOC), &r, 0)) {
mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_MPDEMUX_CDDB_FailedToReadTOC);
return 0;
}
first = toc.FirstTrack - 1; last = toc.LastTrack;
for (i = first; i <= last; i++) {
cdtoc[i].min = toc.TrackData[i].Address[1];
cdtoc[i].sec = toc.TrackData[i].Address[2];
cdtoc[i].frame = toc.TrackData[i].Address[3];
}
CloseHandle(drive);
#else
#if defined(__linux__) || defined(__bsdi__) #if defined(__linux__) || defined(__bsdi__)
int drive; int drive;
struct cdrom_tochdr tochdr; struct cdrom_tochdr tochdr;
@ -88,28 +111,6 @@ read_toc(const char *dev) {
} }
close(drive); close(drive);
#elif defined(WIN32)
HANDLE drive;
DWORD r;
CDROM_TOC toc;
char device[10];
sprintf(device, "\\\\.\\%s", dev);
drive = CreateFile(device, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
if(!DeviceIoControl(drive, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(CDROM_TOC), &r, 0)) {
mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_MPDEMUX_CDDB_FailedToReadTOC);
return 0;
}
first = toc.FirstTrack - 1; last = toc.LastTrack;
for (i = first; i <= last; i++) {
cdtoc[i].min = toc.TrackData[i].Address[1];
cdtoc[i].sec = toc.TrackData[i].Address[2];
cdtoc[i].frame = toc.TrackData[i].Address[3];
}
CloseHandle(drive);
#elif defined(__FreeBSD__) || defined(__DragonFly__) #elif defined(__FreeBSD__) || defined(__DragonFly__)
int drive; int drive;
struct ioc_toc_header tochdr; struct ioc_toc_header tochdr;
@ -156,6 +157,7 @@ read_toc(const char *dev) {
cdtoc[i].frame = toc_buffer.addr.msf.frame; cdtoc[i].frame = toc_buffer.addr.msf.frame;
} }
close(drive); close(drive);
#endif
#endif #endif
for (i = first; i <= last; i++) for (i = first; i <= last; i++)
cdtoc[i].frame += (cdtoc[i].min * 60 + cdtoc[i].sec) * 75; cdtoc[i].frame += (cdtoc[i].min * 60 + cdtoc[i].sec) * 75;