diff options
| -rw-r--r-- | engines/groovie/groovie.cpp | 2 | ||||
| -rw-r--r-- | engines/groovie/music.cpp | 10 | ||||
| -rw-r--r-- | engines/groovie/music.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp index 9027262a0c..8b6ee2ca42 100644 --- a/engines/groovie/groovie.cpp +++ b/engines/groovie/groovie.cpp @@ -158,7 +158,7 @@ Common::Error GroovieEngine::run() { _musicPlayer = new MusicPlayerMac(this); break; case Common::kPlatformIOS: - _musicPlayer = new MusicPlayerMPEG4(this); + _musicPlayer = new MusicPlayerIOS(this); break; default: _musicPlayer = new MusicPlayerXMI(this, _gameDescription->version == kGroovieT7G ? "fat" : "sample"); diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp index 26b3458037..9a3903e9dc 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -765,26 +765,26 @@ Common::SeekableReadStream *MusicPlayerMac::decompressMidi(Common::SeekableReadS return new Common::MemoryReadStream(output, size, DisposeAfterUse::YES); } -MusicPlayerMPEG4::MusicPlayerMPEG4(GroovieEngine *vm) : MusicPlayer(vm) { +MusicPlayerIOS::MusicPlayerIOS(GroovieEngine *vm) : MusicPlayer(vm) { vm->getTimerManager()->installTimerProc(&onTimer, 50 * 1000, this); } -MusicPlayerMPEG4::~MusicPlayerMPEG4() { +MusicPlayerIOS::~MusicPlayerIOS() { _vm->getTimerManager()->removeTimerProc(&onTimer); } -void MusicPlayerMPEG4::updateVolume() { +void MusicPlayerIOS::updateVolume() { // Just set the mixer volume for the music sound type _vm->_system->getMixer()->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, _userVolume * _gameVolume / 100); } -void MusicPlayerMPEG4::unload() { +void MusicPlayerIOS::unload() { MusicPlayer::unload(); _vm->_system->getMixer()->stopHandle(_handle); } -bool MusicPlayerMPEG4::load(uint32 fileref, bool loop) { +bool MusicPlayerIOS::load(uint32 fileref, bool loop) { // Find correct filename ResInfo info; _vm->_resMan->getResInfo(fileref, info); diff --git a/engines/groovie/music.h b/engines/groovie/music.h index 5ef6a8e076..7af482e45d 100644 --- a/engines/groovie/music.h +++ b/engines/groovie/music.h @@ -163,10 +163,10 @@ private: Common::SeekableReadStream *decompressMidi(Common::SeekableReadStream *stream); }; -class MusicPlayerMPEG4 : public MusicPlayer { +class MusicPlayerIOS : public MusicPlayer { public: - MusicPlayerMPEG4(GroovieEngine *vm); - ~MusicPlayerMPEG4(); + MusicPlayerIOS(GroovieEngine *vm); + ~MusicPlayerIOS(); protected: void updateVolume(); |