diff options
| author | Max Horn | 2006-04-29 22:33:31 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-29 22:33:31 +0000 |
| commit | 27307acd7c6f9f9083bdcad38ba54f18d4f080b7 (patch) | |
| tree | fd7360382a19b07dcca9b711080b3f6c8f64fd38 /engines/kyra/sound.h | |
| parent | ac0ae13bee890b78442788abe6b87e514c9928a0 (diff) | |
| download | scummvm-rg350-27307acd7c6f9f9083bdcad38ba54f18d4f080b7.tar.gz scummvm-rg350-27307acd7c6f9f9083bdcad38ba54f18d4f080b7.tar.bz2 scummvm-rg350-27307acd7c6f9f9083bdcad38ba54f18d4f080b7.zip | |
Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio
svn-id: r22231
Diffstat (limited to 'engines/kyra/sound.h')
| -rw-r--r-- | engines/kyra/sound.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h index 9d0c131c5c..28444033f5 100644 --- a/engines/kyra/sound.h +++ b/engines/kyra/sound.h @@ -30,9 +30,8 @@ #include "sound/mixer.h" #include "kyra/kyra.h" -class AudioStream; - namespace Audio { +class AudioStream; class Mixer; class SoundHandle; } // end of namespace Audio @@ -68,13 +67,13 @@ protected: Audio::Mixer *_mixer; private: - AudioStream *_currentVocFile; + Audio::AudioStream *_currentVocFile; Audio::SoundHandle _vocHandle; Common::File _compressHandle; struct SpeechCodecs { const char *fileext; - AudioStream *(*streamFunc)(Common::File*, uint32); + Audio::AudioStream *(*streamFunc)(Common::File*, uint32); }; static const SpeechCodecs _supportedCodes[]; |