diff options
Diffstat (limited to 'sword1')
| -rw-r--r-- | sword1/credits.cpp | 2 | ||||
| -rw-r--r-- | sword1/music.cpp | 6 | ||||
| -rw-r--r-- | sword1/music.h | 4 | ||||
| -rw-r--r-- | sword1/sound.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sword1/credits.cpp b/sword1/credits.cpp index d207c7b4db..55587406b1 100644 --- a/sword1/credits.cpp +++ b/sword1/credits.cpp @@ -112,7 +112,7 @@ void CreditsPlayer::play(void) { _system->updateScreen(); // everything's initialized, time to render and show the credits. - SoundHandle bgSound; + Audio::SoundHandle bgSound; _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &bgSound, bgSoundStream, 0); int relDelay = 0; diff --git a/sword1/music.cpp b/sword1/music.cpp index f0b70f5731..02eb47714c 100644 --- a/sword1/music.cpp +++ b/sword1/music.cpp @@ -275,8 +275,8 @@ void Music::mixer(int16 *buf, uint32 len) { } void Music::setVolume(uint8 volL, uint8 volR) { - _volumeL = (st_volume_t)volL; - _volumeR = (st_volume_t)volR; + _volumeL = (Audio::st_volume_t)volL; + _volumeR = (Audio::st_volume_t)volR; } void Music::giveVolume(uint8 *volL, uint8 *volR) { @@ -327,7 +327,7 @@ void Music::startMusic(int32 tuneId, int32 loopFlag) { As the corresponding _converter is NULL, the handle will be ignored by the playing thread */ if (_handles[newStream].play(_tuneList[tuneId], loopFlag != 0)) { _mutex.lock(); - _converter[newStream] = makeRateConverter(_handles[newStream].getRate(), _mixer->getOutputRate(), _handles[newStream].isStereo(), false); + _converter[newStream] = Audio::makeRateConverter(_handles[newStream].getRate(), _mixer->getOutputRate(), _handles[newStream].isStereo(), false); _mutex.unlock(); } } else { diff --git a/sword1/music.h b/sword1/music.h index 5628cbce40..d3dd46ccd1 100644 --- a/sword1/music.h +++ b/sword1/music.h @@ -103,9 +103,9 @@ public: int getRate() const { return _sampleRate; } private: - st_volume_t _volumeL, _volumeR; + Audio::st_volume_t _volumeL, _volumeR; MusicHandle _handles[2]; - RateConverter *_converter[2]; + Audio::RateConverter *_converter[2]; Audio::Mixer *_mixer; uint32 _sampleRate; Common::Mutex _mutex; diff --git a/sword1/sound.h b/sword1/sound.h index 5b2469aa81..bca1b2c64a 100644 --- a/sword1/sound.h +++ b/sword1/sound.h @@ -44,7 +44,7 @@ namespace Sword1 { struct QueueElement { uint32 id, delay; - SoundHandle handle; + Audio::SoundHandle handle; }; struct RoomVol { @@ -103,7 +103,7 @@ private: uint32 _cowHeaderSize; uint8 _currentCowFile; CowMode _cowMode; - SoundHandle _speechHandle, _fxHandle; + Audio::SoundHandle _speechHandle, _fxHandle; Common::RandomSource _rnd; QueueElement _fxQueue[MAX_FXQ_LENGTH]; |