comparison AudioPlayer.h @ 2116:18dee3152c52

Merge
author Grumpy7
date Mon, 23 Dec 2013 15:18:16 +0100
parents a94c5bee0225
children d44b7775fc06
comparison
equal deleted inserted replaced
2115:90cc547a7927 2116:18dee3152c52
163 } 163 }
164 164
165 void SetMusicVolume(int vol); 165 void SetMusicVolume(int vol);
166 void SetMasterVolume(float fVolume); 166 void SetMasterVolume(float fVolume);
167 void _4AA258(int a2); 167 void _4AA258(int a2);
168 void PlaySound(SoundID eSoundID, signed int a3, unsigned int uNumRepeats, signed int a5, signed int a6, int a7, unsigned int uVolume, int sPlaybackRate); 168 void PlaySound(SoundID eSoundID, signed int a3, unsigned int uNumRepeats, signed int a5, signed int a6, int a7, float uVolume, int sPlaybackRate);
169 void UpdateSounds(); 169 void UpdateSounds();
170 void StopChannels(int uStartChannel, int uEndChannel); 170 void StopChannels(int uStartChannel, int uEndChannel);
171 void LoadAudioSnd(); 171 void LoadAudioSnd();
172 void Initialize(); 172 void Initialize();
173 LSTATUS CheckA3DSupport(char a2); 173 LSTATUS CheckA3DSupport(char a2);
279 279
280 #pragma pack(push, 1) 280 #pragma pack(push, 1)
281 struct SoundList 281 struct SoundList
282 { 282 {
283 inline SoundList(): 283 inline SoundList():
284 sNumSounds(0), pSounds(nullptr), uTotalLoadedSoundSize(0) 284 sNumSounds(0), pSL_Sounds(nullptr), uTotalLoadedSoundSize(0)
285 {} 285 {}
286 286
287 void Initialize(); 287 void Initialize();
288 __int16 LoadSound(int a1, unsigned int a3); 288 __int16 LoadSound(int a1, unsigned int a3);
289 int LoadSound(unsigned int a2, LPVOID lpBuffer, int uBufferSizeLeft, int *pOutSoundSize, int a6); 289 int LoadSound(unsigned int a2, LPVOID lpBuffer, int uBufferSizeLeft, int *pOutSoundSize, int a6);
293 void ToFile(); 293 void ToFile();
294 void FromFile(void *data_mm6, void *data_mm7, void *data_mm8); 294 void FromFile(void *data_mm6, void *data_mm7, void *data_mm8);
295 int FromFileTxt(const char *Args); 295 int FromFileTxt(const char *Args);
296 296
297 signed int sNumSounds; 297 signed int sNumSounds;
298 SoundDesc *pSounds; 298 SoundDesc *pSL_Sounds;
299 unsigned int uTotalLoadedSoundSize; 299 unsigned int uTotalLoadedSoundSize;
300 }; 300 };
301 #pragma pack(pop) 301 #pragma pack(pop)
302 302
303 303