qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2025-02-07 23:51:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Should work on NetBSD (and with some luck OpenBSD) too now.

Browse source 
Fixed bug in the BSD code.
This commit is contained in:
Marcus Sundberg 2000-01-08 22:04:37 +00:00
parent aa00566766
commit ef0921cfb7
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
common/cd_linux.c
View file

@ -131,7 +131,9 @@ void CDAudio_Play(byte track, qboolean looping)
struct cdrom_tocentry entry; struct cdrom_tocentry entry;
struct cdrom_ti ti; struct cdrom_ti ti;
#elif defined(USE_BSD_CD) #elif defined(USE_BSD_CD)
#ifdef HAVE_STRUCT_IOC_READ_TOC_SINGLE_ENTRY_ENTRY
struct ioc_read_toc_single_entry entry; struct ioc_read_toc_single_entry entry;
#endif
struct ioc_play_track ti; struct ioc_play_track ti;
#endif #endif
@ -153,6 +155,7 @@ void CDAudio_Play(byte track, qboolean looping)
return; return;
} }
#if !defined(USE_BSD_CD) || defined(HAVE_STRUCT_IOC_READ_TOC_SINGLE_ENTRY_ENTRY)
// don't try to play a non-audio track // don't try to play a non-audio track
#if defined(USE_LINUX_CD) #if defined(USE_LINUX_CD)
entry.cdte_track = track; entry.cdte_track = track;
@ -176,6 +179,7 @@ void CDAudio_Play(byte track, qboolean looping)
Con_Printf("CDAudio: track %i is not audio\n", track); Con_Printf("CDAudio: track %i is not audio\n", track);
return; return;
} }
#endif /* HAVE_STRUCT_IOC_READ_TOC_SINGLE_ENTRY_ENTRY */
if (playing) if (playing)
{ {
@ -196,8 +200,13 @@ void CDAudio_Play(byte track, qboolean looping)
ti.end_index = 99; ti.end_index = 99;
#endif #endif
if ( ioctl(cdfile, CDROMPLAYTRKIND, &ti) == -1 ) #ifdef USE_BSD_CD
{ if (ioctl(cdfile, CDIOCSTART) == -1) {
Con_DPrintf("CD start ioctl failed\n");
}
#endif
if (ioctl(cdfile, CDROMPLAYTRKIND, &ti) == -1) {
Con_DPrintf("CD play ioctl failed\n"); Con_DPrintf("CD play ioctl failed\n");
return; return;
} }
@ -268,6 +277,7 @@ void CDAudio_Update(void)
struct cdrom_subchnl subchnl; struct cdrom_subchnl subchnl;
#elif defined(USE_BSD_CD) #elif defined(USE_BSD_CD)
struct ioc_read_subchannel subchnl; struct ioc_read_subchannel subchnl;
struct cd_sub_channel_info subchnldata;
#endif #endif
static time_t lastchk; static time_t lastchk;
@ -295,7 +305,11 @@ void CDAudio_Update(void)
#if defined(USE_LINUX_CD) #if defined(USE_LINUX_CD)
subchnl.cdsc_format = CDROM_MSF; subchnl.cdsc_format = CDROM_MSF;
#elif defined(USE_BSD_CD) #elif defined(USE_BSD_CD)
subchnl.data_format = CD_MSF_FORMAT; subchnl.address_format = CD_MSF_FORMAT;
subchnl.data_format = CD_CURRENT_POSITION;
subchnl.track = 0;
subchnl.data_len = sizeof(subchnldata);
subchnl.data = &subchnl
#endif #endif
if (ioctl(cdfile, CDROMSUBCHNL, &subchnl) == -1 ) { if (ioctl(cdfile, CDROMSUBCHNL, &subchnl) == -1 ) {
Con_DPrintf("CD subcchannel ioctl failed\n"); Con_DPrintf("CD subcchannel ioctl failed\n");