Mercurial > mm7
comparison AudioPlayer.h @ 1477:7ef4b64f6329
* LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Added support for most of mm6 resources, placeholders for mm8 resources.
Fixed few C4258
author | Nomad |
---|---|
date | Wed, 28 Aug 2013 18:43:07 +0200 |
parents | 2ca62c9e7b3c |
children | 421c29d4ab3e |
comparison
equal
deleted
inserted
replaced
1475:d7720c1f1d3b | 1477:7ef4b64f6329 |
---|---|
251 { | 251 { |
252 unsigned int uDataSize; | 252 unsigned int uDataSize; |
253 char pData[1]; | 253 char pData[1]; |
254 }; | 254 }; |
255 | 255 |
256 struct SoundDesc | 256 struct SoundDesc_mm6 |
257 { | 257 { |
258 inline bool Is3D() {return (uFlags & SOUND_DESC_3D) != 0;} | 258 inline bool Is3D() {return (uFlags & SOUND_DESC_3D) != 0;} |
259 | 259 |
260 char pSoundName[32]; | 260 char pSoundName[32]; |
261 unsigned int uSoundID; | 261 unsigned int uSoundID; |
262 SOUND_DESC_TYPE eType; | 262 SOUND_DESC_TYPE eType; |
263 int uFlags; | 263 int uFlags; |
264 SoundData *pSoundData[17]; | 264 SoundData *pSoundData[17]; |
265 }; | |
266 | |
267 struct SoundDesc: public SoundDesc_mm6 | |
268 { | |
265 void *p3DSound; | 269 void *p3DSound; |
266 int bDecompressed; | 270 int bDecompressed; |
267 }; | 271 }; |
268 #pragma pack(pop) | 272 #pragma pack(pop) |
269 | 273 |
281 int LoadSound(unsigned int a2, LPVOID lpBuffer, int uBufferSizeLeft, int *pOutSoundSize, int a6); | 285 int LoadSound(unsigned int a2, LPVOID lpBuffer, int uBufferSizeLeft, int *pOutSoundSize, int a6); |
282 SoundDesc *Release(); | 286 SoundDesc *Release(); |
283 void _4A9D79(int a2); | 287 void _4A9D79(int a2); |
284 void UnloadSound(unsigned int uSoundID, char a3); | 288 void UnloadSound(unsigned int uSoundID, char a3); |
285 void ToFile(); | 289 void ToFile(); |
286 void *FromFile(void *pSerialized); | 290 void FromFile(void *data_mm6, void *data_mm7, void *data_mm8); |
287 int FromFileTxt(const char *Args); | 291 int FromFileTxt(const char *Args); |
288 | 292 |
289 signed int sNumSounds; | 293 signed int sNumSounds; |
290 SoundDesc *pSounds; | 294 SoundDesc *pSounds; |
291 unsigned int uTotalLoadedSoundSize; | 295 unsigned int uTotalLoadedSoundSize; |