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 /sky/intro.cpp | |
| 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 'sky/intro.cpp')
| -rw-r--r-- | sky/intro.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sky/intro.cpp b/sky/intro.cpp index e4a517b0e9..f677282c54 100644 --- a/sky/intro.cpp +++ b/sky/intro.cpp @@ -618,7 +618,7 @@ uint16 Intro::_floppyIntroSeq[] = { SEQEND }; -Intro::Intro(Disk *disk, Screen *screen, MusicBase *music, Sound *sound, Text *text, SoundMixer *mixer, OSystem *system) { +Intro::Intro(Disk *disk, Screen *screen, MusicBase *music, Sound *sound, Text *text, Audio::Mixer *mixer, OSystem *system) { _skyDisk = disk; _skyScreen = screen; @@ -739,7 +739,7 @@ bool Intro::nextPart(uint16 *&data) { // directly, but this will have to do for now. memset(vData, 127, sizeof(struct dataFileHeader)); _mixer->playRaw(&_voice, vData, _skyDisk->_lastLoadedFileSize, 11025, - SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED, SOUND_VOICE); + Audio::Mixer::FLAG_AUTOFREE | Audio::Mixer::FLAG_UNSIGNED, SOUND_VOICE); return true; case WAITVOICE: while (_mixer->isSoundHandleActive(_voice)) @@ -756,12 +756,12 @@ bool Intro::nextPart(uint16 *&data) { case LOOPBG: _mixer->stopID(SOUND_BG); _mixer->playRaw(&_bgSfx, _bgBuf + 256, _bgSize - 768, 11025, - SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_LOOP, SOUND_BG); + Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_LOOP, SOUND_BG); return true; case PLAYBG: _mixer->stopID(SOUND_BG); _mixer->playRaw(&_bgSfx, _bgBuf + 256, _bgSize - 768, 11025, - SoundMixer::FLAG_UNSIGNED, SOUND_BG); + Audio::Mixer::FLAG_UNSIGNED, SOUND_BG); return true; case STOPBG: _mixer->stopID(SOUND_BG); |