diff options
| author | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
| commit | 00279659b22cbd5db739d5351e83a9fc2a2ae408 (patch) | |
| tree | 497f06f46820043cbdf1725652b8f0073223e24a /engines/toon/audio.h | |
| parent | d932df79bed5aac97e17c0920a5e75cb5ce733ee (diff) | |
| parent | d1628feb761acc9f4607f64de3eb620fea53bcc9 (diff) | |
| download | scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.gz scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.bz2 scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'engines/toon/audio.h')
| -rw-r--r-- | engines/toon/audio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/toon/audio.h b/engines/toon/audio.h index 61a534265e..25063603eb 100644 --- a/engines/toon/audio.h +++ b/engines/toon/audio.h @@ -103,7 +103,7 @@ public: AudioStreamPackage(ToonEngine *vm); ~AudioStreamPackage(); - bool loadAudioPackage(Common::String indexFile, Common::String streamFile); + bool loadAudioPackage(const Common::String &indexFile, const Common::String &streamFile); void getInfo(int32 id, int32 *offset, int32 *size); Common::SeekableReadStream *getStream(int32 id, bool ownMemory = false); protected: @@ -131,7 +131,7 @@ public: bool voiceStillPlaying(); - void playMusic(Common::String dir, Common::String music); + void playMusic(const Common::String &dir, const Common::String &music); void playVoice(int32 id, bool genericVoice); int32 playSFX(int32 id, int volume, bool genericSFX); void stopCurrentVoice(); @@ -152,7 +152,7 @@ public: void setAmbientSFXVolume(int32 id, int volume); void closeAudioPack(int32 id); - bool loadAudioPack(int32 id, Common::String indexFile, Common::String packFile); + bool loadAudioPack(int32 id, const Common::String &indexFile, const Common::String &packFile); AudioStreamInstance *_channels[16]; // 0-1 : music // 2 : voice |