X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=snd_win.c;h=0fec464b841422c9ecb69ba0f3a222549aa5e985;hb=d5e7478d0936c70701177645e3b06c8446ba9262;hp=427f7c66e218a1f4fd840a529c5b10727cf5bad9;hpb=9e1d9d449d3f69ade2f01e16e47d1e0ab3cf1688;p=xonotic%2Fdarkplaces.git diff --git a/snd_win.c b/snd_win.c index 427f7c66..0fec464b 100644 --- a/snd_win.c +++ b/snd_win.c @@ -18,7 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "quakedef.h" -#include "winquake.h" +#include +#include + +extern HWND mainwindow; #define iDirectSoundCreate(a,b,c) pDirectSoundCreate(a,b,c) @@ -191,19 +194,19 @@ sndinitstat SNDDMA_InitDirect (void) int i; memset((void *)shm, 0, sizeof(*shm)); - shm->channels = 2; - shm->samplebits = 16; + shm->format.channels = 2; + shm->format.width = 2; i = COM_CheckParm ("-sndspeed"); // LordHavoc: -sndspeed option if (i && i != (com_argc - 1)) - shm->speed = atoi(com_argv[i+1]); + shm->format.speed = atoi(com_argv[i+1]); else - shm->speed = 44100; + shm->format.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.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; @@ -214,7 +217,7 @@ sndinitstat SNDDMA_InitDirect (void) if (hInstDS == NULL) { - Con_SafePrintf ("Couldn't load dsound.dll\n"); + Con_SafePrint("Couldn't load dsound.dll\n"); return SIS_FAILURE; } @@ -222,7 +225,7 @@ sndinitstat SNDDMA_InitDirect (void) if (!pDirectSoundCreate) { - Con_SafePrintf ("Couldn't get DS proc addr\n"); + Con_SafePrint("Couldn't get DS proc addr\n"); return SIS_FAILURE; } } @@ -231,7 +234,7 @@ sndinitstat SNDDMA_InitDirect (void) { if (hresult != DSERR_ALLOCATED) { - Con_SafePrintf ("DirectSound create failed\n"); + Con_SafePrint("DirectSound create failed\n"); return SIS_FAILURE; } @@ -241,8 +244,7 @@ sndinitstat SNDDMA_InitDirect (void) "Sound not available", MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY) { - Con_SafePrintf ("DirectSoundCreate failure\n" - " hardware already in use\n"); + Con_SafePrint("DirectSoundCreate failure\n hardware already in use\n"); return SIS_NOTAVAIL; } } @@ -251,19 +253,19 @@ sndinitstat SNDDMA_InitDirect (void) if (DS_OK != pDS->lpVtbl->GetCaps (pDS, &dscaps)) { - Con_SafePrintf ("Couldn't get DS caps\n"); + Con_SafePrint("Couldn't get DS caps\n"); } if (dscaps.dwFlags & DSCAPS_EMULDRIVER) { - Con_SafePrintf ("No DirectSound driver installed\n"); + Con_SafePrint("No DirectSound driver installed\n"); FreeSound (); return SIS_FAILURE; } if (DS_OK != pDS->lpVtbl->SetCooperativeLevel (pDS, mainwindow, DSSCL_EXCLUSIVE)) { - Con_SafePrintf ("Set coop level failed\n"); + Con_SafePrint("Set coop level failed\n"); FreeSound (); return SIS_FAILURE; } @@ -289,12 +291,12 @@ sndinitstat SNDDMA_InitDirect (void) if (DS_OK != pDSPBuf->lpVtbl->SetFormat (pDSPBuf, &pformat)) { if (snd_firsttime) - Con_SafePrintf ("Set primary sound buffer format: no\n"); + Con_SafePrint("Set primary sound buffer format: no\n"); } else { if (snd_firsttime) - Con_SafePrintf ("Set primary sound buffer format: yes\n"); + Con_SafePrint("Set primary sound buffer format: yes\n"); primary_format_set = true; } @@ -315,42 +317,42 @@ sndinitstat SNDDMA_InitDirect (void) if (DS_OK != pDS->lpVtbl->CreateSoundBuffer(pDS, &dsbuf, &pDSBuf, NULL)) { - Con_SafePrintf ("DS:CreateSoundBuffer Failed"); + Con_SafePrint("DS:CreateSoundBuffer Failed\n"); FreeSound (); return SIS_FAILURE; } - shm->channels = format.nChannels; - shm->samplebits = format.wBitsPerSample; - shm->speed = format.nSamplesPerSec; + shm->format.channels = format.nChannels; + shm->format.width = format.wBitsPerSample / 8; + shm->format.speed = format.nSamplesPerSec; if (DS_OK != pDSBuf->lpVtbl->GetCaps (pDSBuf, &dsbcaps)) { - Con_SafePrintf ("DS:GetCaps failed\n"); + Con_SafePrint("DS:GetCaps failed\n"); FreeSound (); return SIS_FAILURE; } if (snd_firsttime) - Con_SafePrintf ("Using secondary sound buffer\n"); + Con_SafePrint("Using secondary sound buffer\n"); } else { if (DS_OK != pDS->lpVtbl->SetCooperativeLevel (pDS, mainwindow, DSSCL_WRITEPRIMARY)) { - Con_SafePrintf ("Set coop level failed\n"); + Con_SafePrint("Set coop level failed\n"); FreeSound (); return SIS_FAILURE; } if (DS_OK != pDSPBuf->lpVtbl->GetCaps (pDSPBuf, &dsbcaps)) { - Con_Printf ("DS:GetCaps failed\n"); + Con_Print("DS:GetCaps failed\n"); return SIS_FAILURE; } pDSBuf = pDSPBuf; - Con_SafePrintf ("Using primary sound buffer\n"); + Con_SafePrint("Using primary sound buffer\n"); } // Make sure mixer is active @@ -360,25 +362,25 @@ sndinitstat SNDDMA_InitDirect (void) Con_SafePrintf(" %d channel(s)\n" " %d bits/sample\n" " %d samples/sec\n", - shm->channels, shm->samplebits, shm->speed); + shm->format.channels, shm->format.width * 8, shm->format.speed); gSndBufSize = dsbcaps.dwBufferBytes; // initialize the buffer reps = 0; - while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &lpData, &dwSize, NULL, NULL, 0)) != DS_OK) + while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, (LPVOID*)&lpData, &dwSize, NULL, NULL, 0)) != DS_OK) { if (hresult != DSERR_BUFFERLOST) { - Con_SafePrintf ("SNDDMA_InitDirect: DS::Lock Sound Buffer Failed\n"); + Con_SafePrint("SNDDMA_InitDirect: DS::Lock Sound Buffer Failed\n"); FreeSound (); return SIS_FAILURE; } if (++reps > 10000) { - Con_SafePrintf ("SNDDMA_InitDirect: DS: couldn't restore buffer\n"); + Con_SafePrint("SNDDMA_InitDirect: DS: couldn't restore buffer\n"); FreeSound (); return SIS_FAILURE; } @@ -396,10 +398,10 @@ sndinitstat SNDDMA_InitDirect (void) pDSBuf->lpVtbl->GetCurrentPosition(pDSBuf, &mmstarttime.u.sample, &dwWrite); pDSBuf->lpVtbl->Play(pDSBuf, 0, 0, DSBPLAY_LOOPING); - shm->samples = gSndBufSize/(shm->samplebits/8); + shm->samples = gSndBufSize / shm->format.width; shm->samplepos = 0; shm->buffer = (unsigned char *) lpData; - sample16 = (shm->samplebits/8) - 1; + sample16 = shm->format.width - 1; dsound_init = true; @@ -424,19 +426,19 @@ qboolean SNDDMA_InitWav (void) snd_completed = 0; memset((void *)shm, 0, sizeof(*shm)); - shm->channels = 2; - shm->samplebits = 16; + shm->format.channels = 2; + shm->format.width = 2; i = COM_CheckParm ("-sndspeed"); // LordHavoc: -sndspeed option if (i && i != (com_argc - 1)) - shm->speed = atoi(com_argv[i+1]); + shm->format.speed = atoi(com_argv[i+1]); else - shm->speed = 44100; + shm->format.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.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; @@ -450,7 +452,7 @@ qboolean SNDDMA_InitWav (void) { if (hr != MMSYSERR_ALLOCATED) { - Con_SafePrintf ("waveOutOpen failed\n"); + Con_SafePrint("waveOutOpen failed\n"); return false; } @@ -460,8 +462,7 @@ qboolean SNDDMA_InitWav (void) "Sound not available", MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY) { - Con_SafePrintf ("waveOutOpen failure;\n" - " hardware already in use\n"); + Con_SafePrint("waveOutOpen failure;\n hardware already in use\n"); return false; } } @@ -476,14 +477,14 @@ qboolean SNDDMA_InitWav (void) hData = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, gSndBufSize); if (!hData) { - Con_SafePrintf ("Sound: Out of memory.\n"); + Con_SafePrint("Sound: Out of memory.\n"); FreeSound (); return false; } lpData = GlobalLock(hData); if (!lpData) { - Con_SafePrintf ("Sound: Failed to lock.\n"); + Con_SafePrint("Sound: Failed to lock.\n"); FreeSound (); return false; } @@ -499,7 +500,7 @@ qboolean SNDDMA_InitWav (void) if (hWaveHdr == NULL) { - Con_SafePrintf ("Sound: Failed to Alloc header.\n"); + Con_SafePrint("Sound: Failed to Alloc header.\n"); FreeSound (); return false; } @@ -508,7 +509,7 @@ qboolean SNDDMA_InitWav (void) if (lpWaveHdr == NULL) { - Con_SafePrintf ("Sound: Failed to lock header.\n"); + Con_SafePrint("Sound: Failed to lock header.\n"); FreeSound (); return false; } @@ -524,16 +525,16 @@ qboolean SNDDMA_InitWav (void) if (waveOutPrepareHeader(hWaveOut, lpWaveHdr+i, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) { - Con_SafePrintf ("Sound: failed to prepare wave headers\n"); + Con_SafePrint("Sound: failed to prepare wave headers\n"); FreeSound (); return false; } } - shm->samples = gSndBufSize/(shm->samplebits/8); + shm->samples = gSndBufSize / shm->format.width; shm->samplepos = 0; shm->buffer = (unsigned char *) lpData; - sample16 = (shm->samplebits/8) - 1; + sample16 = shm->format.width - 1; wav_init = true; @@ -565,19 +566,19 @@ qboolean SNDDMA_Init(void) { if (snd_firsttime || snd_isdirect) { - stat = SNDDMA_InitDirect ();; + stat = SNDDMA_InitDirect (); if (stat == SIS_SUCCESS) { snd_isdirect = true; if (snd_firsttime) - Con_SafePrintf ("DirectSound initialized\n"); + Con_SafePrint("DirectSound initialized\n"); } else { snd_isdirect = false; - Con_SafePrintf ("DirectSound failed to init\n"); + Con_SafePrint("DirectSound failed to init\n"); } } } @@ -596,11 +597,11 @@ qboolean SNDDMA_Init(void) if (snd_iswave) { if (snd_firsttime) - Con_SafePrintf ("Wave sound initialized\n"); + Con_SafePrint("Wave sound initialized\n"); } else { - Con_SafePrintf ("Wave sound failed to init\n"); + Con_SafePrint("Wave sound failed to init\n"); } } } @@ -671,7 +672,7 @@ void SNDDMA_Submit(void) { if ( snd_completed == snd_sent ) { - Con_DPrintf ("Sound overrun\n"); + Con_DPrint("Sound overrun\n"); break; } @@ -700,7 +701,7 @@ void SNDDMA_Submit(void) if (wResult != MMSYSERR_NOERROR) { - Con_SafePrintf ("Failed to write block to device\n"); + Con_SafePrint("Failed to write block to device\n"); FreeSound (); return; } @@ -732,11 +733,11 @@ void *S_LockBuffer(void) { reps = 0; - while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &dsound_pbuf, &dsound_dwSize, &dsound_pbuf2, &dsound_dwSize2, 0)) != DS_OK) + while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, (LPVOID*)&dsound_pbuf, &dsound_dwSize, (LPVOID*)&dsound_pbuf2, &dsound_dwSize2, 0)) != DS_OK) { if (hresult != DSERR_BUFFERLOST) { - Con_Printf ("S_LockBuffer: DS::Lock Sound Buffer Failed\n"); + Con_Print("S_LockBuffer: DS::Lock Sound Buffer Failed\n"); S_Shutdown (); S_Startup (); return NULL; @@ -744,7 +745,7 @@ void *S_LockBuffer(void) if (++reps > 10000) { - Con_Printf ("S_LockBuffer: DS: couldn't restore buffer\n"); + Con_Print("S_LockBuffer: DS: couldn't restore buffer\n"); S_Shutdown (); S_Startup (); return NULL;