diff options
| author | Paul Gilbert | 2012-05-03 21:43:00 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2012-05-03 21:43:00 +1000 |
| commit | ba2711b5e39e495c4cfb1187710605bb9fbf10b1 (patch) | |
| tree | 6c82dc434190f2af307410b27597ead06bfcb7ce /engines/tony/sound.h | |
| parent | fde1f13676273405cd2d686f1e0ae53834c049ff (diff) | |
| download | scummvm-rg350-ba2711b5e39e495c4cfb1187710605bb9fbf10b1.tar.gz scummvm-rg350-ba2711b5e39e495c4cfb1187710605bb9fbf10b1.tar.bz2 scummvm-rg350-ba2711b5e39e495c4cfb1187710605bb9fbf10b1.zip | |
TONY: Implemented methods of sound.cpp (mostly stubbed out)
Diffstat (limited to 'engines/tony/sound.h')
| -rw-r--r-- | engines/tony/sound.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/engines/tony/sound.h b/engines/tony/sound.h index c966c93888..7ed8f97b3e 100644 --- a/engines/tony/sound.h +++ b/engines/tony/sound.h @@ -48,12 +48,21 @@ #ifndef TONY_SOUND_H #define TONY_SOUND_H +#include "common/file.h" #include "tony/gfxcore.h" #include "tony/loc.h" #include "tony/utils.h" namespace Tony { +// Dummy type declarations +typedef void *LPDIRECTSOUND; +typedef void *LPDIRECTSOUNDBUFFER; +typedef uint32 HWND; +struct DSCAPS { +}; + + class FPSTREAM; class FPSFX; class CODEC; @@ -78,12 +87,10 @@ class FPSOUND { private: bool bSoundSupported; -/* LPDIRECTSOUND lpDS; LPDIRECTSOUNDBUFFER lpDSBPrimary; DSCAPS dscaps; HWND hwnd; -*/ /****************************************************************************\ * Metodi @@ -301,7 +308,7 @@ public: bool LoadFile(char *lpszFileName, uint32 dwCodec = FPCODEC_RAW); bool LoadFile(byte *lpBuf, uint32 dwCodec); - bool LoadVoiceFromVDB(Common::File &hvdb); + bool LoadVoiceFromVDB(Common::File &vdbFP); /****************************************************************************\ @@ -410,7 +417,7 @@ private: uint32 dwCodec; // CODEC utilizzato HANDLE hThreadEnd; // Evento per chiudere il thread - HANDLE hFile; // Handle del file di stream + Common::File _file; // Handle del file di stream HANDLE hPlayThread; // Handle del thread di play HANDLE hHot1, hHot2, hHot3; // Eventi settati da DirectSoundNotify HANDLE hPlayThread_PlayFast; @@ -497,7 +504,7 @@ public: * \****************************************************************************/ - bool LoadFile(char *lpszFileName, uint32 dwCodec = FPCODEC_RAW, int nSync = 2000); + bool LoadFile(const char *lpszFileName, uint32 dwCodec = FPCODEC_RAW, int nSync = 2000); |