This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
static int snd_sent, snd_completed;
-/*
- * Global variables. Must be visible to window-procedure function
- * so it can unlock and free the data block after it has been played.
- */
+/*
+ * Global variables. Must be visible to window-procedure function
+ * so it can unlock and free the data block after it has been played.
+ */
HANDLE hData;
HPSTR lpData, lpData2;
HGLOBAL hWaveHdr;
LPWAVEHDR lpWaveHdr;
-HWAVEOUT hWaveOut;
+HWAVEOUT hWaveOut;
WAVEOUTCAPS wavecaps;
if (hWaveHdr)
{
- GlobalUnlock(hWaveHdr);
+ GlobalUnlock(hWaveHdr);
GlobalFree(hWaveHdr);
}
DSBCAPS dsbcaps;
DWORD dwSize, dwWrite;
DSCAPS dscaps;
- WAVEFORMATEX format, pformat;
+ WAVEFORMATEX format, pformat;
HRESULT hresult;
int reps;
int i;
- memset ((void *)&sn, 0, sizeof (sn));
-
- shm = &sn;
-
+ memset((void *)shm, 0, sizeof(*shm));
shm->channels = 2;
shm->samplebits = 16;
i = COM_CheckParm ("-sndspeed"); // LordHavoc: -sndspeed option
if (i && i != (com_argc - 1))
shm->speed = atoi(com_argv[i+1]);
else
- shm->speed = 11025;
+ shm->speed = 44100;
memset (&format, 0, sizeof(format));
format.wFormatTag = WAVE_FORMAT_PCM;
format.nSamplesPerSec = shm->speed;
format.nBlockAlign = format.nChannels * format.wBitsPerSample / 8;
format.cbSize = 0;
- format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
+ format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
if (!hInstDS)
{
hInstDS = LoadLibrary("dsound.dll");
-
+
if (hInstDS == NULL)
{
Con_SafePrintf ("Couldn't load dsound.dll\n");
" %d bits/sample\n"
" %d samples/sec\n",
shm->channels, shm->samplebits, shm->speed);
-
+
gSndBufSize = dsbcaps.dwBufferBytes;
// initialize the buffer
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;
+ lpData = NULL;
pDSBuf->lpVtbl->Stop(pDSBuf);
pDSBuf->lpVtbl->GetCurrentPosition(pDSBuf, &mmstarttime.u.sample, &dwWrite);
pDSBuf->lpVtbl->Play(pDSBuf, 0, 0, DSBPLAY_LOOPING);
- shm->soundalive = true;
- shm->splitbuffer = false;
shm->samples = gSndBufSize/(shm->samplebits/8);
shm->samplepos = 0;
- shm->submission_chunk = 1;
shm->buffer = (unsigned char *) lpData;
sample16 = (shm->samplebits/8) - 1;
*/
qboolean SNDDMA_InitWav (void)
{
- WAVEFORMATEX format;
+ WAVEFORMATEX format;
int i;
HRESULT hr;
-
+
snd_sent = 0;
snd_completed = 0;
- shm = &sn;
-
+ memset((void *)shm, 0, sizeof(*shm));
shm->channels = 2;
shm->samplebits = 16;
i = COM_CheckParm ("-sndspeed"); // LordHavoc: -sndspeed option
if (i && i != (com_argc - 1))
shm->speed = atoi(com_argv[i+1]);
else
- shm->speed = 11025;
+ shm->speed = 44100;
memset (&format, 0, sizeof(format));
format.wFormatTag = WAVE_FORMAT_PCM;
*format.wBitsPerSample / 8;
format.cbSize = 0;
format.nAvgBytesPerSec = format.nSamplesPerSec
- *format.nBlockAlign;
-
- /* Open a waveform device for output using window callback. */
- while ((hr = waveOutOpen((LPHWAVEOUT)&hWaveOut, WAVE_MAPPER,
- &format,
+ *format.nBlockAlign;
+
+ /* 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)
" 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.
+ /*
+ * 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)
- {
+ hData = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, gSndBufSize);
+ if (!hData)
+ {
Con_SafePrintf ("Sound: Out of memory.\n");
FreeSound ();
- return false;
+ return false;
}
lpData = GlobalLock(hData);
if (!lpData)
- {
+ {
Con_SafePrintf ("Sound: Failed to lock.\n");
FreeSound ();
- return false;
- }
+ return false;
+ }
memset (lpData, 0, gSndBufSize);
- /*
- * Allocate and lock memory for the header. This memory must
- * also be globally allocated with GMEM_MOVEABLE and
- * GMEM_SHARE flags.
- */
- hWaveHdr = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE,
- (DWORD) sizeof(WAVEHDR) * WAV_BUFFERS);
+ /*
+ * Allocate and lock memory for the header. This memory must
+ * also be globally allocated with GMEM_MOVEABLE and
+ * GMEM_SHARE flags.
+ */
+ hWaveHdr = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE,
+ (DWORD) sizeof(WAVEHDR) * WAV_BUFFERS);
if (hWaveHdr == NULL)
- {
+ {
Con_SafePrintf ("Sound: Failed to Alloc header.\n");
FreeSound ();
- return false;
- }
+ return false;
+ }
- lpWaveHdr = (LPWAVEHDR) GlobalLock(hWaveHdr);
+ lpWaveHdr = (LPWAVEHDR) GlobalLock(hWaveHdr);
if (lpWaveHdr == NULL)
- {
+ {
Con_SafePrintf ("Sound: Failed to lock header.\n");
FreeSound ();
- return false;
+ 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;
+ lpWaveHdr[i].dwBufferLength = WAV_BUFFER_SIZE;
lpWaveHdr[i].lpData = lpData + i*WAV_BUFFER_SIZE;
if (waveOutPrepareHeader(hWaveOut, lpWaveHdr+i, sizeof(WAVEHDR)) !=
}
}
- shm->soundalive = true;
- shm->splitbuffer = false;
shm->samples = gSndBufSize/(shm->samplebits/8);
shm->samplepos = 0;
- shm->submission_chunk = 1;
shm->buffer = (unsigned char *) lpData;
sample16 = (shm->samplebits/8) - 1;
int s;
DWORD dwWrite;
- if (dsound_init)
+ if (dsound_init)
{
mmtime.wType = TIME_SAMPLES;
pDSBuf->lpVtbl->GetCurrentPosition(pDSBuf, &mmtime.u.sample, &dwWrite);
{
if ( snd_completed == snd_sent )
{
+#ifndef AKVERSION
Con_DPrintf ("Sound overrun\n");
+#endif
break;
}
h = lpWaveHdr + ( snd_sent&WAV_MASK );
snd_sent++;
- /*
- * Now the data block can be sent to the output device. The
- * waveOutWrite function returns immediately and waveform
- * data is sent to the output device in the background.
- */
- wResult = waveOutWrite(hWaveOut, h, sizeof(WAVEHDR));
+ /*
+ * Now the data block can be sent to the output device. The
+ * waveOutWrite function returns immediately and waveform
+ * data is sent to the output device in the background.
+ */
+ wResult = waveOutWrite(hWaveOut, h, sizeof(WAVEHDR));
if (wResult != MMSYSERR_NOERROR)
- {
+ {
Con_SafePrintf ("Failed to write block to device\n");
FreeSound ();
- return;
- }
+ return;
+ }
}
}
FreeSound ();
}
+DWORD dsound_dwSize;
+DWORD dsound_dwSize2;
+DWORD *dsound_pbuf;
+DWORD *dsound_pbuf2;
+void *S_LockBuffer(void)
+{
+ int reps;
+ HRESULT hresult;
+
+ if (pDSBuf)
+ {
+ reps = 0;
+
+ while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &dsound_pbuf, &dsound_dwSize, &dsound_pbuf2, &dsound_dwSize2, 0)) != DS_OK)
+ {
+ if (hresult != DSERR_BUFFERLOST)
+ {
+ Con_Printf ("S_LockBuffer: DS::Lock Sound Buffer Failed\n");
+ S_Shutdown ();
+ S_Startup ();
+ return NULL;
+ }
+
+ if (++reps > 10000)
+ {
+ Con_Printf ("S_LockBuffer: DS: couldn't restore buffer\n");
+ S_Shutdown ();
+ S_Startup ();
+ return NULL;
+ }
+ }
+ return dsound_pbuf;
+ }
+ else
+ return shm->buffer;
+}
+
+void S_UnlockBuffer(void)
+{
+ if (pDSBuf)
+ pDSBuf->lpVtbl->Unlock(pDSBuf, dsound_pbuf, dsound_dwSize, dsound_pbuf2, dsound_dwSize2);
+}
+
projects / xonotic / darkplaces.git / blobdiff