*/
#include "quakedef.h"
+#include "snd_main.h"
+
+#ifndef DIRECTSOUND_VERSION
+# define DIRECTSOUND_VERSION 0x0500 /* Version 5.0 */
+#endif
#include <windows.h>
+#include <mmsystem.h>
#include <dsound.h>
extern HWND mainwindow;
-#define iDirectSoundCreate(a,b,c) pDirectSoundCreate(a,b,c)
-
HRESULT (WINAPI *pDirectSoundCreate)(GUID FAR *lpGUID, LPDIRECTSOUND FAR *lplpDS, IUnknown FAR *pUnkOuter);
-// 64K is > 1 second at 16-bit, 22050 Hz
+// Wave output: 64KB in 64 buffers of 1KB
+// (64KB is > 1 sec at 16-bit 22050 Hz mono, and is 1/3 sec at 16-bit 44100 Hz stereo)
#define WAV_BUFFERS 64
-#define WAV_MASK 0x3F
-#define WAV_BUFFER_SIZE 0x0400
-#define SECONDARY_BUFFER_SIZE 0x10000
+#define WAV_MASK (WAV_BUFFERS - 1)
+#define WAV_BUFFER_SIZE 1024
-typedef enum {SIS_SUCCESS, SIS_FAILURE, SIS_NOTAVAIL} sndinitstat;
+// DirectSound output: 64KB in 1 buffer
+#define SECONDARY_BUFFER_SIZE (64 * 1024)
+
+typedef enum sndinitstat_e {SIS_SUCCESS, SIS_FAILURE, SIS_NOTAVAIL} sndinitstat;
-static qboolean wavonly;
static qboolean dsound_init;
static qboolean wav_init;
-static qboolean snd_firsttime = true, snd_isdirect, snd_iswave;
static qboolean primary_format_set;
-static int sample16;
static int snd_sent, snd_completed;
+static int prev_painted;
+static unsigned int paintpot;
+
+static unsigned int dsound_time;
+
/*
* Global variables. Must be visible to window-procedure function
DWORD gSndBufSize;
-MMTIME mmstarttime;
+DWORD dwStartTime;
LPDIRECTSOUND pDS;
LPDIRECTSOUNDBUFFER pDSBuf, pDSPBuf;
qboolean SNDDMA_InitWav (void);
sndinitstat SNDDMA_InitDirect (void);
-/*
-==================
-S_BlockSound
-==================
-*/
-void S_BlockSound (void)
-{
-
-// DirectSound takes care of blocking itself
- if (snd_iswave)
- {
- snd_blocked++;
-
- if (snd_blocked == 1)
- {
- waveOutReset (hWaveOut);
- }
- }
-}
-
-
-/*
-==================
-S_UnblockSound
-==================
-*/
-void S_UnblockSound (void)
-{
-
-// DirectSound takes care of blocking itself
- if (snd_iswave)
- {
- snd_blocked--;
- }
-}
-
-
-/*
-==================
-FreeSound
-==================
-*/
-void FreeSound (void)
-{
- int i;
-
- if (pDSBuf)
- {
- pDSBuf->lpVtbl->Stop(pDSBuf);
- pDSBuf->lpVtbl->Release(pDSBuf);
- }
-
-// only release primary buffer if it's not also the mixing buffer we just released
- if (pDSPBuf && (pDSBuf != pDSPBuf))
- {
- pDSPBuf->lpVtbl->Release(pDSPBuf);
- }
-
- if (pDS)
- {
- pDS->lpVtbl->SetCooperativeLevel (pDS, mainwindow, DSSCL_NORMAL);
- pDS->lpVtbl->Release(pDS);
- }
-
- if (hWaveOut)
- {
- waveOutReset (hWaveOut);
-
- if (lpWaveHdr)
- {
- for (i=0 ; i< WAV_BUFFERS ; i++)
- waveOutUnprepareHeader (hWaveOut, lpWaveHdr+i, sizeof(WAVEHDR));
- }
-
- waveOutClose (hWaveOut);
-
- if (hWaveHdr)
- {
- GlobalUnlock(hWaveHdr);
- GlobalFree(hWaveHdr);
- }
-
- if (hData)
- {
- GlobalUnlock(hData);
- GlobalFree(hData);
- }
-
- }
-
- pDS = NULL;
- pDSBuf = NULL;
- pDSPBuf = NULL;
- hWaveOut = 0;
- hData = 0;
- hWaveHdr = 0;
- lpData = NULL;
- lpWaveHdr = NULL;
- dsound_init = false;
- wav_init = false;
-}
-
/*
==================
-SNDDMA_InitDirect
+SndSys_InitDirectSound
-Direct-Sound support
+DirectSound 5 support
==================
*/
-sndinitstat SNDDMA_InitDirect (void)
+static sndinitstat SndSys_InitDirectSound (const snd_format_t* requested, snd_format_t* suggested)
{
DSBUFFERDESC dsbuf;
DSBCAPS dsbcaps;
- DWORD dwSize, dwWrite;
+ DWORD dwSize;
DSCAPS dscaps;
WAVEFORMATEX format, pformat;
HRESULT hresult;
int reps;
- int i;
-
- memset((void *)shm, 0, sizeof(*shm));
- shm->format.channels = 2;
- shm->format.width = 2;
- i = COM_CheckParm ("-sndspeed"); // LordHavoc: -sndspeed option
- if (i && i != (com_argc - 1))
- shm->format.speed = atoi(com_argv[i+1]);
- else
- shm->format.speed = 44100;
memset (&format, 0, sizeof(format));
format.wFormatTag = WAVE_FORMAT_PCM;
- format.nChannels = shm->format.channels;
- format.wBitsPerSample = shm->format.width * 8;
- format.nSamplesPerSec = shm->format.speed;
+ format.nChannels = requested->channels;
+ format.wBitsPerSample = requested->width * 8;
+ format.nSamplesPerSec = requested->speed;
format.nBlockAlign = format.nChannels * format.wBitsPerSample / 8;
- format.cbSize = 0;
format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
+ format.cbSize = 0;
if (!hInstDS)
{
if (hInstDS == NULL)
{
- Con_SafePrint("Couldn't load dsound.dll\n");
+ Con_Print("Couldn't load dsound.dll\n");
return SIS_FAILURE;
}
if (!pDirectSoundCreate)
{
- Con_SafePrint("Couldn't get DS proc addr\n");
+ Con_Print("Couldn't get DS proc addr\n");
return SIS_FAILURE;
}
}
- while ((hresult = iDirectSoundCreate(NULL, &pDS, NULL)) != DS_OK)
+ while ((hresult = pDirectSoundCreate(NULL, &pDS, NULL)) != DS_OK)
{
if (hresult != DSERR_ALLOCATED)
{
- Con_SafePrint("DirectSound create failed\n");
+ Con_Print("DirectSound create failed\n");
return SIS_FAILURE;
}
"Sound not available",
MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY)
{
- Con_SafePrint("DirectSoundCreate failure\n hardware already in use\n");
+ Con_Print("DirectSoundCreate failure\n hardware already in use\n");
return SIS_NOTAVAIL;
}
}
dscaps.dwSize = sizeof(dscaps);
- if (DS_OK != pDS->lpVtbl->GetCaps (pDS, &dscaps))
+ if (DS_OK != IDirectSound_GetCaps (pDS, &dscaps))
{
- Con_SafePrint("Couldn't get DS caps\n");
+ Con_Print("Couldn't get DS caps\n");
}
if (dscaps.dwFlags & DSCAPS_EMULDRIVER)
{
- Con_SafePrint("No DirectSound driver installed\n");
- FreeSound ();
+ Con_Print("No DirectSound driver installed\n");
+ SndSys_Shutdown ();
return SIS_FAILURE;
}
- if (DS_OK != pDS->lpVtbl->SetCooperativeLevel (pDS, mainwindow, DSSCL_EXCLUSIVE))
+ if (DS_OK != IDirectSound_SetCooperativeLevel (pDS, mainwindow, DSSCL_EXCLUSIVE))
{
- Con_SafePrint("Set coop level failed\n");
- FreeSound ();
+ Con_Print("Set coop level failed\n");
+ SndSys_Shutdown ();
return SIS_FAILURE;
}
-// get access to the primary buffer, if possible, so we can set the
-// sound hardware format
+ // get access to the primary buffer, if possible, so we can set the
+ // sound hardware format
memset (&dsbuf, 0, sizeof(dsbuf));
dsbuf.dwSize = sizeof(DSBUFFERDESC);
dsbuf.dwFlags = DSBCAPS_PRIMARYBUFFER;
dsbcaps.dwSize = sizeof(dsbcaps);
primary_format_set = false;
+// COMMANDLINEOPTION: Windows DirectSound: -snoforceformat uses the format that DirectSound returns, rather than forcing it
if (!COM_CheckParm ("-snoforceformat"))
{
- if (DS_OK == pDS->lpVtbl->CreateSoundBuffer(pDS, &dsbuf, &pDSPBuf, NULL))
+ if (DS_OK == IDirectSound_CreateSoundBuffer(pDS, &dsbuf, &pDSPBuf, NULL))
{
pformat = format;
- if (DS_OK != pDSPBuf->lpVtbl->SetFormat (pDSPBuf, &pformat))
+ if (DS_OK != IDirectSoundBuffer_SetFormat (pDSPBuf, &pformat))
{
- if (snd_firsttime)
- Con_SafePrint("Set primary sound buffer format: no\n");
+ Con_Print("Set primary sound buffer format: no\n");
}
else
{
- if (snd_firsttime)
- Con_SafePrint("Set primary sound buffer format: yes\n");
+ Con_Print("Set primary sound buffer format: yes\n");
primary_format_set = true;
}
}
}
+// COMMANDLINEOPTION: Windows DirectSound: -primarysound locks the sound hardware for exclusive use
if (!primary_format_set || !COM_CheckParm ("-primarysound"))
{
- // create the secondary buffer we'll actually work with
+ HRESULT result;
+
+ // create the secondary buffer we'll actually work with
memset (&dsbuf, 0, sizeof(dsbuf));
dsbuf.dwSize = sizeof(DSBUFFERDESC);
dsbuf.dwFlags = DSBCAPS_CTRLFREQUENCY | DSBCAPS_LOCSOFTWARE;
memset(&dsbcaps, 0, sizeof(dsbcaps));
dsbcaps.dwSize = sizeof(dsbcaps);
- if (DS_OK != pDS->lpVtbl->CreateSoundBuffer(pDS, &dsbuf, &pDSBuf, NULL))
+ result = IDirectSound_CreateSoundBuffer(pDS, &dsbuf, &pDSBuf, NULL);
+ if (result != DS_OK ||
+ requested->channels != format.nChannels ||
+ requested->width != format.wBitsPerSample / 8 ||
+ requested->speed != format.nSamplesPerSec)
{
- Con_SafePrint("DS:CreateSoundBuffer Failed\n");
- FreeSound ();
+ Con_Printf("DS:CreateSoundBuffer Failed (%d): channels=%u, width=%u, speed=%u\n",
+ result, format.nChannels, format.wBitsPerSample / 8, format.nSamplesPerSec);
+ SndSys_Shutdown ();
return SIS_FAILURE;
}
- shm->format.channels = format.nChannels;
- shm->format.width = format.wBitsPerSample / 8;
- shm->format.speed = format.nSamplesPerSec;
-
- if (DS_OK != pDSBuf->lpVtbl->GetCaps (pDSBuf, &dsbcaps))
+ if (DS_OK != IDirectSoundBuffer_GetCaps (pDSBuf, &dsbcaps))
{
- Con_SafePrint("DS:GetCaps failed\n");
- FreeSound ();
+ Con_Print("DS:GetCaps failed\n");
+ SndSys_Shutdown ();
return SIS_FAILURE;
}
- if (snd_firsttime)
- Con_SafePrint("Using secondary sound buffer\n");
+ Con_Print("Using secondary sound buffer\n");
}
else
{
- if (DS_OK != pDS->lpVtbl->SetCooperativeLevel (pDS, mainwindow, DSSCL_WRITEPRIMARY))
+ if (DS_OK != IDirectSound_SetCooperativeLevel (pDS, mainwindow, DSSCL_WRITEPRIMARY))
{
- Con_SafePrint("Set coop level failed\n");
- FreeSound ();
+ Con_Print("Set coop level failed\n");
+ SndSys_Shutdown ();
return SIS_FAILURE;
}
- if (DS_OK != pDSPBuf->lpVtbl->GetCaps (pDSPBuf, &dsbcaps))
+ if (DS_OK != IDirectSoundBuffer_GetCaps (pDSPBuf, &dsbcaps))
{
Con_Print("DS:GetCaps failed\n");
return SIS_FAILURE;
}
pDSBuf = pDSPBuf;
- Con_SafePrint("Using primary sound buffer\n");
+ Con_Print("Using primary sound buffer\n");
}
// Make sure mixer is active
- pDSBuf->lpVtbl->Play(pDSBuf, 0, 0, DSBPLAY_LOOPING);
+ IDirectSoundBuffer_Play(pDSBuf, 0, 0, DSBPLAY_LOOPING);
- if (snd_firsttime)
- Con_SafePrintf(" %d channel(s)\n"
- " %d bits/sample\n"
- " %d samples/sec\n",
- shm->format.channels, shm->format.width * 8, shm->format.speed);
+ Con_DPrintf(" %d channel(s)\n"
+ " %d bits/sample\n"
+ " %d samples/sec\n",
+ requested->channels, requested->width * 8, requested->speed);
gSndBufSize = dsbcaps.dwBufferBytes;
-// initialize the buffer
+ // initialize the buffer
reps = 0;
- while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, (LPVOID*)&lpData, &dwSize, NULL, NULL, 0)) != DS_OK)
+ while ((hresult = IDirectSoundBuffer_Lock(pDSBuf, 0, gSndBufSize, (LPVOID*)&lpData, &dwSize, NULL, NULL, 0)) != DS_OK)
{
if (hresult != DSERR_BUFFERLOST)
{
- Con_SafePrint("SNDDMA_InitDirect: DS::Lock Sound Buffer Failed\n");
- FreeSound ();
+ Con_Print("SNDDMA_InitDirect: DS::Lock Sound Buffer Failed\n");
+ SndSys_Shutdown ();
return SIS_FAILURE;
}
if (++reps > 10000)
{
- Con_SafePrint("SNDDMA_InitDirect: DS: couldn't restore buffer\n");
- FreeSound ();
+ Con_Print("SNDDMA_InitDirect: DS: couldn't restore buffer\n");
+ SndSys_Shutdown ();
return SIS_FAILURE;
}
}
memset(lpData, 0, dwSize);
+ IDirectSoundBuffer_Unlock(pDSBuf, lpData, dwSize, NULL, 0);
- pDSBuf->lpVtbl->Unlock(pDSBuf, lpData, dwSize, NULL, 0);
-
- /* we don't want anyone to access the buffer directly w/o locking it first. */
- lpData = NULL;
-
- pDSBuf->lpVtbl->Stop(pDSBuf);
- pDSBuf->lpVtbl->GetCurrentPosition(pDSBuf, &mmstarttime.u.sample, &dwWrite);
- pDSBuf->lpVtbl->Play(pDSBuf, 0, 0, DSBPLAY_LOOPING);
+ IDirectSoundBuffer_Stop(pDSBuf);
+ IDirectSoundBuffer_Play(pDSBuf, 0, 0, DSBPLAY_LOOPING);
- shm->samples = gSndBufSize / shm->format.width;
- shm->samplepos = 0;
- shm->buffer = (unsigned char *) lpData;
- sample16 = shm->format.width - 1;
+ dwStartTime = 0;
+ dsound_time = 0;
+ snd_renderbuffer = Snd_CreateRingBuffer(requested, gSndBufSize / (requested->width * requested->channels), lpData);
dsound_init = true;
/*
==================
-SNDDM_InitWav
+SndSys_InitMmsystem
Crappy windows multimedia base
==================
*/
-qboolean SNDDMA_InitWav (void)
+static qboolean SndSys_InitMmsystem (const snd_format_t* requested, snd_format_t* suggested)
{
WAVEFORMATEX format;
int i;
HRESULT hr;
- snd_sent = 0;
- snd_completed = 0;
-
- memset((void *)shm, 0, sizeof(*shm));
- shm->format.channels = 2;
- shm->format.width = 2;
- i = COM_CheckParm ("-sndspeed"); // LordHavoc: -sndspeed option
- if (i && i != (com_argc - 1))
- shm->format.speed = atoi(com_argv[i+1]);
- else
- shm->format.speed = 44100;
-
memset (&format, 0, sizeof(format));
format.wFormatTag = WAVE_FORMAT_PCM;
- format.nChannels = shm->format.channels;
- format.wBitsPerSample = shm->format.width * 8;
- format.nSamplesPerSec = shm->format.speed;
- format.nBlockAlign = format.nChannels
- *format.wBitsPerSample / 8;
- format.cbSize = 0;
- format.nAvgBytesPerSec = format.nSamplesPerSec
- *format.nBlockAlign;
-
- /* Open a waveform device for output using window callback. */
+ format.nChannels = requested->channels;
+ format.wBitsPerSample = requested->width * 8;
+ format.nSamplesPerSec = requested->speed;
+ format.nBlockAlign = format.nChannels * format.wBitsPerSample / 8;
+ format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
+ format.cbSize = 0;
+
+ // Open a waveform device for output using window callback
while ((hr = waveOutOpen((LPHWAVEOUT)&hWaveOut, WAVE_MAPPER,
&format,
0, 0L, CALLBACK_NULL)) != MMSYSERR_NOERROR)
{
if (hr != MMSYSERR_ALLOCATED)
{
- Con_SafePrint("waveOutOpen failed\n");
+ Con_Print("waveOutOpen failed\n");
return false;
}
"Sound not available",
MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY)
{
- Con_SafePrint("waveOutOpen failure;\n hardware already in use\n");
+ Con_Print("waveOutOpen failure;\n hardware already in use\n");
return false;
}
}
* Allocate and lock memory for the waveform data. The memory
* for waveform data must be globally allocated with
* GMEM_MOVEABLE and GMEM_SHARE flags.
-
- */
+ */
gSndBufSize = WAV_BUFFERS*WAV_BUFFER_SIZE;
hData = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, gSndBufSize);
if (!hData)
{
- Con_SafePrint("Sound: Out of memory.\n");
- FreeSound ();
+ Con_Print("Sound: Out of memory.\n");
+ SndSys_Shutdown ();
return false;
}
lpData = GlobalLock(hData);
if (!lpData)
{
- Con_SafePrint("Sound: Failed to lock.\n");
- FreeSound ();
+ Con_Print("Sound: Failed to lock.\n");
+ SndSys_Shutdown ();
return false;
}
memset (lpData, 0, gSndBufSize);
if (hWaveHdr == NULL)
{
- Con_SafePrint("Sound: Failed to Alloc header.\n");
- FreeSound ();
+ Con_Print("Sound: Failed to Alloc header.\n");
+ SndSys_Shutdown ();
return false;
}
if (lpWaveHdr == NULL)
{
- Con_SafePrint("Sound: Failed to lock header.\n");
- FreeSound ();
+ Con_Print("Sound: Failed to lock header.\n");
+ SndSys_Shutdown ();
return false;
}
memset (lpWaveHdr, 0, sizeof(WAVEHDR) * WAV_BUFFERS);
- /* After allocation, set up and prepare headers. */
+ // After allocation, set up and prepare headers
for (i=0 ; i<WAV_BUFFERS ; i++)
{
lpWaveHdr[i].dwBufferLength = WAV_BUFFER_SIZE;
if (waveOutPrepareHeader(hWaveOut, lpWaveHdr+i, sizeof(WAVEHDR)) !=
MMSYSERR_NOERROR)
{
- Con_SafePrint("Sound: failed to prepare wave headers\n");
- FreeSound ();
+ Con_Print("Sound: failed to prepare wave headers\n");
+ SndSys_Shutdown ();
return false;
}
}
- shm->samples = gSndBufSize / shm->format.width;
- shm->samplepos = 0;
- shm->buffer = (unsigned char *) lpData;
- sample16 = shm->format.width - 1;
+ snd_renderbuffer = Snd_CreateRingBuffer(requested, gSndBufSize / (requested->width * requested->channels), lpData);
+
+ prev_painted = 0;
+ paintpot = 0;
+
+ snd_sent = 0;
+ snd_completed = 0;
wav_init = true;
return true;
}
+
/*
-==================
-SNDDMA_Init
+====================
+SndSys_Init
-Try to find a sound device to mix for.
-Returns false if nothing is found.
-==================
+Create "snd_renderbuffer" with the proper sound format if the call is successful
+May return a suggested format if the requested format isn't available
+====================
*/
-
-qboolean SNDDMA_Init(void)
+qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
{
+ qboolean wavonly;
sndinitstat stat;
- if (COM_CheckParm ("-wavonly"))
- wavonly = true;
+ Con_Print ("SndSys_Init: using the Win32 module\n");
- dsound_init = wav_init = 0;
+// COMMANDLINEOPTION: Windows Sound: -wavonly uses wave sound instead of DirectSound
+ wavonly = (COM_CheckParm ("-wavonly") != 0);
+ dsound_init = false;
+ wav_init = false;
stat = SIS_FAILURE; // assume DirectSound won't initialize
- /* Init DirectSound */
+ // Init DirectSound
if (!wavonly)
{
- if (snd_firsttime || snd_isdirect)
- {
- stat = SNDDMA_InitDirect ();;
-
- if (stat == SIS_SUCCESS)
- {
- snd_isdirect = true;
+ stat = SndSys_InitDirectSound (requested, suggested);
- if (snd_firsttime)
- Con_SafePrint("DirectSound initialized\n");
- }
- else
- {
- snd_isdirect = false;
- Con_SafePrint("DirectSound failed to init\n");
- }
- }
+ if (stat == SIS_SUCCESS)
+ Con_Print("DirectSound initialized\n");
+ else
+ Con_Print("DirectSound failed to init\n");
}
-// if DirectSound didn't succeed in initializing, try to initialize
-// waveOut sound, unless DirectSound failed because the hardware is
-// already allocated (in which case the user has already chosen not
-// to have sound)
+ // if DirectSound didn't succeed in initializing, try to initialize
+ // waveOut sound, unless DirectSound failed because the hardware is
+ // already allocated (in which case the user has already chosen not
+ // to have sound)
if (!dsound_init && (stat != SIS_NOTAVAIL))
{
- if (snd_firsttime || snd_iswave)
- {
-
- snd_iswave = SNDDMA_InitWav ();
-
- if (snd_iswave)
- {
- if (snd_firsttime)
- Con_SafePrint("Wave sound initialized\n");
- }
- else
- {
- Con_SafePrint("Wave sound failed to init\n");
- }
- }
+ if (SndSys_InitMmsystem (requested, suggested))
+ Con_Print("Wave sound (MMSYSTEM) initialized\n");
+ else
+ Con_Print("Wave sound failed to init\n");
}
- snd_firsttime = false;
-
- if (!dsound_init && !wav_init)
- return 0;
-
- return 1;
+ return (dsound_init || wav_init);
}
+
/*
-==============
-SNDDMA_GetDMAPos
+====================
+SndSys_Shutdown
-return the current sample position (in mono samples read)
-inside the recirculating dma buffer, so the mixing code will know
-how many sample are required to fill it up.
-===============
+Stop the sound card, delete "snd_renderbuffer" and free its other resources
+====================
*/
-int SNDDMA_GetDMAPos(void)
+void SndSys_Shutdown (void)
{
- MMTIME mmtime;
- int s;
- DWORD dwWrite;
+ if (pDSBuf)
+ {
+ IDirectSoundBuffer_Stop(pDSBuf);
+ IDirectSoundBuffer_Release(pDSBuf);
+ }
- if (dsound_init)
+ // only release primary buffer if it's not also the mixing buffer we just released
+ if (pDSPBuf && (pDSBuf != pDSPBuf))
{
- mmtime.wType = TIME_SAMPLES;
- pDSBuf->lpVtbl->GetCurrentPosition(pDSBuf, &mmtime.u.sample, &dwWrite);
- s = mmtime.u.sample - mmstarttime.u.sample;
+ IDirectSoundBuffer_Release(pDSPBuf);
}
- else if (wav_init)
+
+ if (pDS)
{
- s = snd_sent * WAV_BUFFER_SIZE;
+ IDirectSound_SetCooperativeLevel (pDS, mainwindow, DSSCL_NORMAL);
+ IDirectSound_Release(pDS);
}
- else
- s = 0;
+ if (hWaveOut)
+ {
+ waveOutReset (hWaveOut);
+
+ if (lpWaveHdr)
+ {
+ unsigned int i;
+
+ for (i=0 ; i< WAV_BUFFERS ; i++)
+ waveOutUnprepareHeader (hWaveOut, lpWaveHdr+i, sizeof(WAVEHDR));
+ }
+
+ waveOutClose (hWaveOut);
+
+ if (hWaveHdr)
+ {
+ GlobalUnlock(hWaveHdr);
+ GlobalFree(hWaveHdr);
+ }
- s >>= sample16;
+ if (hData)
+ {
+ GlobalUnlock(hData);
+ GlobalFree(hData);
+ }
+ }
- s &= (shm->samples-1);
+ if (snd_renderbuffer != NULL)
+ {
+ Mem_Free(snd_renderbuffer);
+ snd_renderbuffer = NULL;
+ }
- return s;
+ pDS = NULL;
+ pDSBuf = NULL;
+ pDSPBuf = NULL;
+ hWaveOut = 0;
+ hData = 0;
+ hWaveHdr = 0;
+ lpData = NULL;
+ lpWaveHdr = NULL;
+ dsound_init = false;
+ wav_init = false;
}
+
/*
-==============
-SNDDMA_Submit
+====================
+SndSys_Submit
-Send sound to device if buffer isn't really the dma buffer
-===============
+Submit the contents of "snd_renderbuffer" to the sound card
+====================
*/
-void SNDDMA_Submit(void)
+void SndSys_Submit (void)
{
LPWAVEHDR h;
int wResult;
+ // DirectSound doesn't need this
if (!wav_init)
return;
- //
- // find which sound blocks have completed
- //
- while (1)
- {
- if ( snd_completed == snd_sent )
- {
- Con_DPrint("Sound overrun\n");
- break;
- }
+ paintpot += (snd_renderbuffer->endframe - prev_painted) * snd_renderbuffer->format.channels * snd_renderbuffer->format.width;
+ if (paintpot > WAV_BUFFERS * WAV_BUFFER_SIZE)
+ paintpot = WAV_BUFFERS * WAV_BUFFER_SIZE;
+ prev_painted = snd_renderbuffer->endframe;
- if ( ! (lpWaveHdr[ snd_completed & WAV_MASK].dwFlags & WHDR_DONE) )
- {
- break;
- }
-
- snd_completed++; // this buffer has been played
- }
-
- //
- // submit two new sound blocks
- //
- while (((snd_sent - snd_completed) >> sample16) < 4)
+ // submit new sound blocks
+ while (paintpot > WAV_BUFFER_SIZE)
{
- h = lpWaveHdr + ( snd_sent&WAV_MASK );
+ h = lpWaveHdr + (snd_sent & WAV_MASK);
snd_sent++;
/*
if (wResult != MMSYSERR_NOERROR)
{
- Con_SafePrint("Failed to write block to device\n");
- FreeSound ();
+ Con_Print("Failed to write block to device\n");
+ SndSys_Shutdown ();
return;
}
+
+ paintpot -= WAV_BUFFER_SIZE;
}
+
}
+
/*
-==============
-SNDDMA_Shutdown
+====================
+SndSys_GetSoundTime
-Reset the sound device for exiting
-===============
+Returns the number of sample frames consumed since the sound started
+====================
*/
-void SNDDMA_Shutdown(void)
+unsigned int SndSys_GetSoundTime (void)
{
- FreeSound ();
+ unsigned int s;
+
+ if (dsound_init)
+ {
+ DWORD dwTime;
+
+ IDirectSoundBuffer_GetCurrentPosition(pDSBuf, &dwTime, NULL);
+ s = (dwTime - dwStartTime) & (gSndBufSize - 1);
+ dwStartTime = dwTime;
+
+ dsound_time += s / (snd_renderbuffer->format.width * snd_renderbuffer->format.channels);
+ return dsound_time;
+ }
+
+ if (wav_init)
+ {
+ // Find which sound blocks have completed
+ for (;;)
+ {
+ if (snd_completed == snd_sent)
+ {
+ Con_DPrint("Sound overrun\n");
+ break;
+ }
+
+ if (!(lpWaveHdr[snd_completed & WAV_MASK].dwFlags & WHDR_DONE))
+ break;
+
+ snd_completed++; // this buffer has been played
+ }
+
+ s = snd_completed * WAV_BUFFER_SIZE;
+
+ return s / (snd_renderbuffer->format.width * snd_renderbuffer->format.channels);
+ }
+
+ return 0;
}
-DWORD dsound_dwSize;
-DWORD dsound_dwSize2;
-DWORD *dsound_pbuf;
-DWORD *dsound_pbuf2;
-void *S_LockBuffer(void)
+
+static DWORD dsound_dwSize;
+static DWORD dsound_dwSize2;
+static DWORD *dsound_pbuf;
+static DWORD *dsound_pbuf2;
+
+/*
+====================
+SndSys_LockRenderBuffer
+
+Get the exclusive lock on "snd_renderbuffer"
+====================
+*/
+qboolean SndSys_LockRenderBuffer (void)
{
int reps;
HRESULT hresult;
+ DWORD dwStatus;
if (pDSBuf)
{
+ // if the buffer was lost or stopped, restore it and/or restart it
+ if (IDirectSoundBuffer_GetStatus (pDSBuf, &dwStatus) != DS_OK)
+ Con_Print("Couldn't get sound buffer status\n");
+
+ if (dwStatus & DSBSTATUS_BUFFERLOST)
+ {
+ Con_Print("DSound buffer is lost!!\n");
+ IDirectSoundBuffer_Restore (pDSBuf);
+ }
+
+ if (!(dwStatus & DSBSTATUS_PLAYING))
+ IDirectSoundBuffer_Play(pDSBuf, 0, 0, DSBPLAY_LOOPING);
+
reps = 0;
- while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, (LPVOID*)&dsound_pbuf, &dsound_dwSize, (LPVOID*)&dsound_pbuf2, &dsound_dwSize2, 0)) != DS_OK)
+ while ((hresult = IDirectSoundBuffer_Lock(pDSBuf, 0, gSndBufSize, (LPVOID*)&dsound_pbuf, &dsound_dwSize, (LPVOID*)&dsound_pbuf2, &dsound_dwSize2, 0)) != DS_OK)
{
if (hresult != DSERR_BUFFERLOST)
{
- Con_Print("S_LockBuffer: DS::Lock Sound Buffer Failed\n");
+ Con_Print("S_LockBuffer: DS: Lock Sound Buffer Failed\n");
S_Shutdown ();
S_Startup ();
- return NULL;
+ return false;
}
if (++reps > 10000)
Con_Print("S_LockBuffer: DS: couldn't restore buffer\n");
S_Shutdown ();
S_Startup ();
- return NULL;
+ return false;
}
}
- return dsound_pbuf;
+
+ if ((void*)dsound_pbuf != snd_renderbuffer->ring)
+ Sys_Error("SndSys_LockRenderBuffer: the ring address has changed!!!\n");
+ return true;
}
- else
- return shm->buffer;
+
+ return wav_init;
}
-void S_UnlockBuffer(void)
+
+/*
+====================
+SndSys_UnlockRenderBuffer
+
+Release the exclusive lock on "snd_renderbuffer"
+====================
+*/
+void SndSys_UnlockRenderBuffer (void)
{
if (pDSBuf)
- pDSBuf->lpVtbl->Unlock(pDSBuf, dsound_pbuf, dsound_dwSize, dsound_pbuf2, dsound_dwSize2);
+ IDirectSoundBuffer_Unlock(pDSBuf, dsound_pbuf, dsound_dwSize, dsound_pbuf2, dsound_dwSize2);
}
-
projects / xonotic / darkplaces.git / blobdiff