diff options
author | Florian Kagerer | 2009-05-23 23:33:31 +0000 |
---|---|---|
committer | Florian Kagerer | 2009-05-23 23:33:31 +0000 |
commit | 5a4b3c54414d7415af6a0838ba558177586a4427 (patch) | |
tree | 325e9e8d48c0900eff926b7b844dc4914d0dd6de /engines/kyra/sound.h | |
parent | a19c23ab7a3f0daaf3e047d96865d78c92f4841c (diff) | |
download | scummvm-rg350-5a4b3c54414d7415af6a0838ba558177586a4427.tar.gz scummvm-rg350-5a4b3c54414d7415af6a0838ba558177586a4427.tar.bz2 scummvm-rg350-5a4b3c54414d7415af6a0838ba558177586a4427.zip |
KYRA/LOL: restructured voice playing code so that audio compression can be supported
svn-id: r40839
Diffstat (limited to 'engines/kyra/sound.h')
-rw-r--r-- | engines/kyra/sound.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h index 52334806ad..bf121ede2b 100644 --- a/engines/kyra/sound.h +++ b/engines/kyra/sound.h @@ -195,15 +195,11 @@ public: * @param isSfx marks file as sfx instead of voice * @return playtime of the voice file (-1 marks unknown playtime) */ - virtual int32 voicePlay(const char *file, uint8 volume = 255, bool isSfx = false); + virtual int32 voicePlay(const char *file, uint8 volume = 255, bool isSfx = false, bool appendSuffix = true); + + Audio::AudioStream *getVoiceStream(const char *file, int32 *totalPlayingTime, bool appendSuffix = true); - /** - * Queues the specified voice files in an AppendableAudioStream - * and plays them. - * - * @param fileList: files to be played - */ - virtual uint32 voicePlayFromList(Common::List<const char*> fileList); + void playVoiceStream(Audio::AudioStream * stream, const char *handleName, uint8 volume = 255, bool isSfx = false); /** * Checks if a voice is being played. @@ -465,7 +461,7 @@ public: void haltTrack(); void beginFadeOut(); - int32 voicePlay(const char *file, uint8 volume = 255, bool isSfx = false) { return -1; } + int32 voicePlay(const char *file, uint8 volume = 255, bool isSfx = false, bool appendSuffix = true) { return -1; } void playSoundEffect(uint8); protected: @@ -492,7 +488,7 @@ public: void haltTrack(); void beginFadeOut(); - int32 voicePlay(const char *file, uint8 volume = 255, bool isSfx = false); + int32 voicePlay(const char *file, uint8 volume = 255, bool isSfx = false, bool appendSuffix = true); void playSoundEffect(uint8 track); protected: |