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 | |
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')
-rw-r--r-- | engines/kyra/kyra.h | 2 | ||||
-rw-r--r-- | engines/kyra/sound.cpp | 8 | ||||
-rw-r--r-- | engines/kyra/sound.h | 7 | ||||
-rw-r--r-- | engines/kyra/sound_adlib.cpp | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/engines/kyra/kyra.h b/engines/kyra/kyra.h index bea64cef4c..5859c92f18 100644 --- a/engines/kyra/kyra.h +++ b/engines/kyra/kyra.h @@ -26,8 +26,6 @@ #include "base/engine.h" #include "common/rect.h" -class AudioStream; - namespace Kyra { class Movie; diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 7874a02d6a..d1891a501a 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -71,7 +71,7 @@ void Sound::voicePlay(const char *file) { Common::MemoryReadStream vocStream(fileData, fileSize); _mixer->stopHandle(_vocHandle); - _currentVocFile = makeVOCStream(vocStream); + _currentVocFile = Audio::makeVOCStream(vocStream); } if (_currentVocFile) @@ -476,13 +476,13 @@ void KyraEngine::snd_voiceWaitForFinish(bool ingame) { const Sound::SpeechCodecs Sound::_supportedCodes[] = { #ifdef USE_MAD - { ".VO3", makeMP3Stream }, + { ".VO3", Audio::makeMP3Stream }, #endif // USE_MAD #ifdef USE_VORBIS - { ".VOG", makeVorbisStream }, + { ".VOG", Audio::makeVorbisStream }, #endif // USE_VORBIS #ifdef USE_FLAC - { ".VOF", makeFlacStream }, + { ".VOF", Audio::makeFlacStream }, #endif // USE_FLAC { 0, 0 } }; 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[]; diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp index aef67e19ef..f870c668b8 100644 --- a/engines/kyra/sound_adlib.cpp +++ b/engines/kyra/sound_adlib.cpp @@ -38,7 +38,7 @@ namespace Kyra { -class AdlibDriver : public AudioStream { +class AdlibDriver : public Audio::AudioStream { public: AdlibDriver(Audio::Mixer *mixer); ~AdlibDriver(); |