*/
#include "quakedef.h"
-#include "winquake.h"
+#include <windows.h>
+#include <dsound.h>
+
+extern HWND mainwindow;
#define iDirectSoundCreate(a,b,c) pDirectSoundCreate(a,b,c)
int reps;
int i;
- memset ((void *)&sn, 0, sizeof (sn));
-
- shm = &sn;
-
- shm->channels = 2;
- shm->samplebits = 16;
- i = COM_CheckParm ("-sndspeed"); // LordHavoc: -sndspeed option
+ memset((void *)shm, 0, sizeof(*shm));
+ shm->format.channels = 2;
+ shm->format.width = 2;
+// COMMANDLINEOPTION: Windows Sound: -sndspeed <hz> chooses 44100 hz, 22100 hz, or 11025 hz sound output rate
+ i = COM_CheckParm ("-sndspeed");
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;
if (hInstDS == NULL)
{
- Con_SafePrintf ("Couldn't load dsound.dll\n");
+ Con_SafePrint("Couldn't load dsound.dll\n");
return SIS_FAILURE;
}
if (!pDirectSoundCreate)
{
- Con_SafePrintf ("Couldn't get DS proc addr\n");
+ Con_SafePrint("Couldn't get DS proc addr\n");
return SIS_FAILURE;
}
}
{
if (hresult != DSERR_ALLOCATED)
{
- Con_SafePrintf ("DirectSound create failed\n");
+ Con_SafePrint("DirectSound create failed\n");
return SIS_FAILURE;
}
"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;
}
}
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;
}
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 != 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;
}
}
}
+// 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
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
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;
}
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->samples = gSndBufSize / shm->format.width;
shm->samplepos = 0;
- shm->submission_chunk = 1;
shm->buffer = (unsigned char *) lpData;
- sample16 = (shm->samplebits/8) - 1;
+ sample16 = shm->format.width - 1;
dsound_init = true;
snd_sent = 0;
snd_completed = 0;
- shm = &sn;
-
- shm->channels = 2;
- shm->samplebits = 16;
+ memset((void *)shm, 0, sizeof(*shm));
+ shm->format.channels = 2;
+ shm->format.width = 2;
+// COMMANDLINEOPTION: Windows Sound: -sndspeed <hz> chooses 44100 hz, 22100 hz, or 11025 hz sound output rate
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;
{
if (hr != MMSYSERR_ALLOCATED)
{
- Con_SafePrintf ("waveOutOpen failed\n");
+ Con_SafePrint("waveOutOpen failed\n");
return false;
}
"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;
}
}
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;
}
if (hWaveHdr == NULL)
{
- Con_SafePrintf ("Sound: Failed to Alloc header.\n");
+ Con_SafePrint("Sound: Failed to Alloc header.\n");
FreeSound ();
return false;
}
if (lpWaveHdr == NULL)
{
- Con_SafePrintf ("Sound: Failed to lock header.\n");
+ Con_SafePrint("Sound: Failed to lock header.\n");
FreeSound ();
return false;
}
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->soundalive = true;
- shm->splitbuffer = false;
- shm->samples = gSndBufSize/(shm->samplebits/8);
+ shm->samples = gSndBufSize / shm->format.width;
shm->samplepos = 0;
- shm->submission_chunk = 1;
shm->buffer = (unsigned char *) lpData;
- sample16 = (shm->samplebits/8) - 1;
+ sample16 = shm->format.width - 1;
wav_init = true;
{
sndinitstat stat;
+// COMMANDLINEOPTION: Windows Sound: -wavonly uses wave sound instead of DirectSound
if (COM_CheckParm ("-wavonly"))
wavonly = true;
{
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");
}
}
}
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");
}
}
}
{
if ( snd_completed == snd_sent )
{
- Con_DPrintf ("Sound overrun\n");
+ Con_DPrint("Sound overrun\n");
break;
}
if (wResult != MMSYSERR_NOERROR)
{
- Con_SafePrintf ("Failed to write block to device\n");
+ Con_SafePrint("Failed to write block to device\n");
FreeSound ();
return;
}
{
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;
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;
pDSBuf->lpVtbl->Unlock(pDSBuf, dsound_pbuf, dsound_dwSize, dsound_pbuf2, dsound_dwSize2);
}
-void S_Open(void)
-{
-}
-
-void S_Close(void)
-{
-}
projects / xonotic / darkplaces.git / blobdiff