qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 22:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

WildCode's dx cleanups

Browse source
This commit is contained in:
Bill Currie 2003-03-11 06:31:30 +00:00
parent 661b812fac
commit ff2a40a7c6
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/winquake.h
View file

@ -61,9 +61,6 @@
# ifdef MINGW_HACKS # ifdef MINGW_HACKS
# undef WINNT # undef WINNT
# endif # endif
# ifdef HAVE_DDRAW_H
# include <ddraw.h>
# endif
# ifdef MINGW_HACKS # ifdef MINGW_HACKS
# define WINNT # define WINNT
# endif # endif
@ -75,9 +72,6 @@
# ifdef HAVE_DSOUND_H # ifdef HAVE_DSOUND_H
# include <dsound.h> # include <dsound.h>
# endif # endif
# ifdef HAVE_DDRAW_H
# include <ddraw.h>
# endif
#endif #endif
#ifdef HAVE_MGRAPH_H #ifdef HAVE_MGRAPH_H

12
libs/audio/targets/snd_dx.c
View file

@ -54,15 +54,11 @@ HRESULT (WINAPI * pDirectSoundCreate) (GUID FAR * lpGUID,
typedef enum { SIS_SUCCESS, SIS_FAILURE, SIS_NOTAVAIL } sndinitstat; typedef enum { SIS_SUCCESS, SIS_FAILURE, SIS_NOTAVAIL } sndinitstat;
static qboolean wavonly;
static qboolean dsound_init; static qboolean dsound_init;
static qboolean wav_init; static qboolean snd_firsttime = true;
static qboolean snd_firsttime = true, snd_isdirect, snd_iswave;
static qboolean primary_format_set; static qboolean primary_format_set;
static int sample16; static int sample16;
static int snd_sent, snd_completed;
static int snd_blocked = 0;
static volatile dma_t sn; static volatile dma_t sn;
/* /*
@ -90,7 +86,6 @@ static LPDIRECTSOUNDBUFFER pDSBuf, pDSPBuf;
static HINSTANCE hInstDS; static HINSTANCE hInstDS;
static sndinitstat SNDDMA_InitDirect (void); static sndinitstat SNDDMA_InitDirect (void);
static qboolean SNDDMA_InitWav (void);
static plugin_t plugin_info; static plugin_t plugin_info;
static plugin_data_t plugin_info_data; static plugin_data_t plugin_info_data;
@ -120,8 +115,6 @@ SNDDMA_UnblockSound (void)
static void static void
FreeSound (void) FreeSound (void)
{ {
int i;
if (pDSBuf) { if (pDSBuf) {
IDirectSoundBuffer_Stop (pDSBuf); IDirectSoundBuffer_Stop (pDSBuf);
IDirectSound_Release (pDSBuf); IDirectSound_Release (pDSBuf);
@ -362,7 +355,6 @@ SNDDMA_Init (void)
stat = SNDDMA_InitDirect (); stat = SNDDMA_InitDirect ();
if (stat == SIS_SUCCESS) { if (stat == SIS_SUCCESS) {
snd_isdirect = true;
Sys_Printf ("DirectSound initialized\n"); Sys_Printf ("DirectSound initialized\n");
} else { } else {
Sys_Printf ("DirectSound failed to init\n"); Sys_Printf ("DirectSound failed to init\n");
@ -493,7 +485,7 @@ DSOUND_Restore (void)
if (!pDSBuf) if (!pDSBuf)
return; return;
if (IDirectSoundBuffer_GetStatus (pDSBuf, &dwStatus) != DD_OK) if (IDirectSoundBuffer_GetStatus (pDSBuf, &dwStatus) != DS_OK)
Sys_Printf ("Couldn't get sound buffer status\n"); Sys_Printf ("Couldn't get sound buffer status\n");
if (dwStatus & DSBSTATUS_BUFFERLOST) if (dwStatus & DSBSTATUS_BUFFERLOST)