X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=snd_win.c;h=427f7c66e218a1f4fd840a529c5b10727cf5bad9;hb=9e1d9d449d3f69ade2f01e16e47d1e0ab3cf1688;hp=1a725ebbabf36f4852b7510beb153cf82e2760bd;hpb=e4b3858e7aca0ead91be1d8f675db084d025abad;p=xonotic%2Fdarkplaces.git diff --git a/snd_win.c b/snd_win.c index 1a725ebb..427f7c66 100644 --- a/snd_win.c +++ b/snd_win.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. 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. @@ -42,10 +42,10 @@ static int sample16; 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; @@ -53,7 +53,7 @@ HPSTR lpData, lpData2; HGLOBAL hWaveHdr; LPWAVEHDR lpWaveHdr; -HWAVEOUT hWaveOut; +HWAVEOUT hWaveOut; WAVEOUTCAPS wavecaps; @@ -147,7 +147,7 @@ void FreeSound (void) if (hWaveHdr) { - GlobalUnlock(hWaveHdr); + GlobalUnlock(hWaveHdr); GlobalFree(hWaveHdr); } @@ -185,38 +185,33 @@ sndinitstat SNDDMA_InitDirect (void) 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.nChannels = shm->channels; format.wBitsPerSample = shm->samplebits; format.nSamplesPerSec = shm->speed; - format.nBlockAlign = format.nChannels - *format.wBitsPerSample / 8; + 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"); @@ -366,7 +361,7 @@ sndinitstat SNDDMA_InitDirect (void) " %d bits/sample\n" " %d samples/sec\n", shm->channels, shm->samplebits, shm->speed); - + gSndBufSize = dsbcaps.dwBufferBytes; // initialize the buffer @@ -391,22 +386,18 @@ sndinitstat SNDDMA_InitDirect (void) } memset(lpData, 0, dwSize); -// lpData[4] = lpData[5] = 0x7f; // force a pop for debugging 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; @@ -425,22 +416,21 @@ Crappy windows multimedia base */ 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; @@ -451,11 +441,11 @@ qboolean SNDDMA_InitWav (void) *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) @@ -474,61 +464,61 @@ qboolean SNDDMA_InitWav (void) " 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 ; isoundalive = 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; @@ -621,12 +608,7 @@ qboolean SNDDMA_Init(void) snd_firsttime = false; if (!dsound_init && !wav_init) - { -// if (snd_firsttime) -// Con_SafePrintf ("No sound device initialized\n"); - return 0; - } return 1; } @@ -646,7 +628,7 @@ int SNDDMA_GetDMAPos(void) int s; DWORD dwWrite; - if (dsound_init) + if (dsound_init) { mmtime.wType = TIME_SAMPLES; pDSBuf->lpVtbl->GetCurrentPosition(pDSBuf, &mmtime.u.sample, &dwWrite); @@ -656,6 +638,8 @@ int SNDDMA_GetDMAPos(void) { s = snd_sent * WAV_BUFFER_SIZE; } + else + s = 0; s >>= sample16; @@ -707,19 +691,19 @@ void SNDDMA_Submit(void) 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; + } } } @@ -735,3 +719,46 @@ void SNDDMA_Shutdown(void) 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); +} +