diff options
author | Johannes Schickel | 2008-04-20 22:24:24 +0000 |
---|---|---|
committer | Johannes Schickel | 2008-04-20 22:24:24 +0000 |
commit | 87f10ebe40d2c18742751f827d011cbf135c6f21 (patch) | |
tree | 76ac4a016ef4e1535506525c7131bcb9ca734fda /engines/kyra/sound.h | |
parent | dfdb73367e3576f23a80d43fdfde6b7f7dde2bc8 (diff) | |
download | scummvm-rg350-87f10ebe40d2c18742751f827d011cbf135c6f21.tar.gz scummvm-rg350-87f10ebe40d2c18742751f827d011cbf135c6f21.tar.bz2 scummvm-rg350-87f10ebe40d2c18742751f827d011cbf135c6f21.zip |
Committed patch removing Audio::Mixer::SoundType alias in Kyra::SoundDigital.
svn-id: r31632
Diffstat (limited to 'engines/kyra/sound.h')
-rw-r--r-- | engines/kyra/sound.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h index d61c095ac9..85648f6b7e 100644 --- a/engines/kyra/sound.h +++ b/engines/kyra/sound.h @@ -504,12 +504,6 @@ public: bool init() { return true; } - enum kSoundTypes { - kSoundTypeMusic, - kSoundTypeSfx, - kSoundTypeSpeech - }; - /** * Plays a sound. * @@ -522,7 +516,7 @@ public: * * @return channel playing the sound */ - int playSound(const char *filename, uint8 priority, kSoundTypes type, int volume = 255, bool loop = false, int channel = -1); + int playSound(const char *filename, uint8 priority, Audio::Mixer::SoundType type, int volume = 255, bool loop = false, int channel = -1); /** * Checks if a given channel is playing a sound. |