From 93a83a6b86116dabc058c4d799615d7e6c496a0c Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Mon, 26 Sep 2016 22:58:32 +0300 Subject: CHEWY: Add an event manager, and get rid of g_engine --- engines/chewy/sound.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'engines/chewy/sound.cpp') diff --git a/engines/chewy/sound.cpp b/engines/chewy/sound.cpp index 9ef4df97d9..fc27f637d4 100644 --- a/engines/chewy/sound.cpp +++ b/engines/chewy/sound.cpp @@ -30,7 +30,8 @@ namespace Chewy { -Sound::Sound() { +Sound::Sound(Audio::Mixer *mixer) { + _mixer = mixer; _speechRes = new SoundResource("speech.tvp"); _soundRes = new SoundResource("details.tap"); } @@ -51,7 +52,7 @@ void Sound::playSound(int num, bool loop) { DisposeAfterUse::NO), loop ? 0 : 1); - g_engine->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundHandle, stream); + _mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundHandle, stream); delete[] sound->data; delete sound; @@ -72,7 +73,7 @@ void Sound::playMusic(int num, bool loop) { DisposeAfterUse::NO), loop ? 0 : 1); - g_engine->_mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, stream); + _mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, stream); } void Sound::playSpeech(int num) { @@ -86,7 +87,7 @@ void Sound::playSpeech(int num) { DisposeAfterUse::NO), 1); - g_engine->_mixer->playStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream); + _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream); delete[] sound->data; delete sound; -- cgit v1.2.3