diff options
| author | Max Horn | 2005-05-10 23:48:48 +0000 |
|---|---|---|
| committer | Max Horn | 2005-05-10 23:48:48 +0000 |
| commit | 1a615346abab8f234c3dbd1c55e78b179bca9d87 (patch) | |
| tree | f687ac73ffbfa29088a403b6311bb4db13265fde /graphics | |
| parent | 72f4c03b0b9a6918a359b967ebc400a2701981d9 (diff) | |
| download | scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.tar.gz scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.tar.bz2 scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.zip | |
Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)
svn-id: r18039
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/animation.cpp | 4 | ||||
| -rw-r--r-- | graphics/animation.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/graphics/animation.cpp b/graphics/animation.cpp index 77be43fdc5..9a237e5f72 100644 --- a/graphics/animation.cpp +++ b/graphics/animation.cpp @@ -30,7 +30,7 @@ namespace Graphics { -BaseAnimationState::BaseAnimationState(SoundMixer *snd, OSystem *sys, int width, int height) +BaseAnimationState::BaseAnimationState(Audio::Mixer *snd, OSystem *sys, int width, int height) : _movieWidth(width), _movieHeight(height), _snd(snd), _sys(sys) { #ifndef BACKEND_8BIT _colorTab = NULL; @@ -143,7 +143,7 @@ bool BaseAnimationState::init(const char *name, void *audioArg) { _bgSoundStream = createAudioStream(name, audioArg); if (_bgSoundStream != NULL) { - _snd->playInputStream(SoundMixer::kSFXSoundType, &_bgSound, _bgSoundStream, -1, 255, 0, false); + _snd->playInputStream(Audio::Mixer::kSFXSoundType, &_bgSound, _bgSoundStream, -1, 255, 0, false); } else { warning("Cutscene: Could not open Audio Track for %s", name); } diff --git a/graphics/animation.h b/graphics/animation.h index 087d9febc7..7a437c08ae 100644 --- a/graphics/animation.h +++ b/graphics/animation.h @@ -74,7 +74,7 @@ protected: const int _movieWidth; const int _movieHeight; - SoundMixer *_snd; + Audio::Mixer *_snd; OSystem *_sys; uint _frameNum; @@ -117,7 +117,7 @@ protected: #endif public: - BaseAnimationState(SoundMixer *snd, OSystem *sys, int width, int height); + BaseAnimationState(Audio::Mixer *snd, OSystem *sys, int width, int height); virtual ~BaseAnimationState(); bool init(const char *name, void *audioArg = NULL); |