aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMax Horn2009-01-30 15:41:23 +0000
committerMax Horn2009-01-30 15:41:23 +0000
commite21f5febdc66ae796a57bdd70fbea2eaf26e1f56 (patch)
tree4dd127a0c0610d43403ca1c0c13edd5392edd626 /engines
parentde8fa39b25df33b4a7777e9283d286b5178e0fa2 (diff)
downloadscummvm-rg350-e21f5febdc66ae796a57bdd70fbea2eaf26e1f56.tar.gz
scummvm-rg350-e21f5febdc66ae796a57bdd70fbea2eaf26e1f56.tar.bz2
scummvm-rg350-e21f5febdc66ae796a57bdd70fbea2eaf26e1f56.zip
Don't use g_engine to access the mixer
svn-id: r36147
Diffstat (limited to 'engines')
-rw-r--r--engines/groovie/roq.cpp4
-rw-r--r--engines/groovie/vdx.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 0c20cdefaf..b016fb8e7f 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -462,7 +462,7 @@ bool ROQPlayer::processBlockSoundMono(ROQBlockHeader &blockHeader) {
#endif
_audioStream = Audio::makeAppendableAudioStream(22050, flags);
Audio::SoundHandle sound_handle;
- ::g_engine->_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
+ g_system->getMixer()->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
}
// Create the audio buffer
@@ -505,7 +505,7 @@ bool ROQPlayer::processBlockSoundStereo(ROQBlockHeader &blockHeader) {
#endif
_audioStream = Audio::makeAppendableAudioStream(22050, flags);
Audio::SoundHandle sound_handle;
- ::g_engine->_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
+ g_system->getMixer()->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
}
// Create the audio buffer
diff --git a/engines/groovie/vdx.cpp b/engines/groovie/vdx.cpp
index 46bd5f3472..37f0ed2579 100644
--- a/engines/groovie/vdx.cpp
+++ b/engines/groovie/vdx.cpp
@@ -488,7 +488,7 @@ void VDXPlayer::chunkSound(Common::ReadStream *in) {
if (!_audioStream) {
_audioStream = Audio::makeAppendableAudioStream(22050, Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_AUTOFREE);
Audio::SoundHandle sound_handle;
- ::g_engine->_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
+ g_system->getMixer()->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
}
byte *data = new byte[60000];