/* under the License. */\r
/* */\r
/* The Original Code is Genesis3D, released March 25, 1999. */\r
-/*Genesis3D Version 1.1 released November 15, 1999 */\r
-/* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */\r
+/* Copyright (C) 1996-1999 Eclipse Entertainment, L.L.C. All Rights Reserved */\r
/* */\r
/****************************************************************************************/\r
#include <windows.h>\r
#include <stdio.h>\r
#include <assert.h>\r
\r
-#include "include/BaseType.h"\r
-#include "include/ErrorLog.h"\r
-#include "include/VFile.h"\r
+#include "BaseType.h"\r
+#include "ErrorLog.h"\r
+#include "VFile.h"\r
#include "Sound.h"\r
-#include "include/Ram.h"\r
+#include "Ram.h"\r
\r
typedef struct SoundManager SoundManager;\r
typedef struct Channel Channel;\r
//LPDIRECTSOUNDNOTIFY * smNotify;\r
} SoundManager;\r
\r
-static LPDIRECTSOUND lpDirectSound;\r
+static LPDIRECTSOUND lpDirectSound = NULL;\r
// This isn't really safe as a global. But it's consistent with the global lpDirectSound.\r
static HMODULE hmodDirectSound = NULL;\r
\r
FreeChannel(SoundS->SoundM, Channel);\r
}\r
\r
-//=====================================================================================\r
-// Sound_FreeAllChannels\r
-//=====================================================================================\r
-GENESISAPI void geSound_FreeAllChannels(geSound_System *SoundS)\r
-{\r
- if (!SoundS) return;\r
-\r
- FreeAllChannels( SoundS->SoundM );\r
-}\r
-\r
//=====================================================================================\r
// Sound_SetGlobalVolume\r
//=====================================================================================\r
Channel* Channel;\r
\r
assert(SoundS != NULL);\r
- if(Sound == NULL)\r
- return GE_FALSE; // eaa3 05/29/2000 don't assert if NULL handle!\r
+ assert(Sound != NULL); \r
\r
Channel = GetChannel(SoundS->SoundM, (unsigned int)Sound);\r
\r
memset(dsBD, 0, sizeof(DSBUFFERDESC));\r
\r
dsBD->dwSize = sizeof(DSBUFFERDESC);\r
- dsBD->dwFlags = DSBCAPS_STATIC | DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLFREQUENCY;\r
+ dsBD->dwFlags = DSBCAPS_STATIC | DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLPAN |\r
+ DSBCAPS_CTRLFREQUENCY | DSBCAPS_CTRLVOLUME;\r
if (!DSParseWaveResource(data, &dsBD->lpwfxFormat, pbWaveData, &dsBD->dwBufferBytes))\r
{\r
geErrorLog_Add(GE_ERR_INVALID_WAV, NULL);\r
{\r
\r
Freq = (DWORD)(channel->BaseFreq * cfg->Frequency);\r
- \r
- if(Freq < 0)\r
- Freq = 0;\r
-\r
Error = IDirectSoundBuffer_SetFrequency(channel->buffer, Freq);\r
if (Error != DS_OK)\r
{\r