libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 20:51:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

GROOVIE: Rename MusicPlayerMPEG4 to MusicPlayerIOS

Browse Source 
More fitting now that other music formats can be used now
This commit is contained in:
Matthew Hoops 2011-05-31 14:25:20 -04:00
parent aa49b38c5a
commit 5bb4ef13c5
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/groovie/groovie.cpp
View File

@ -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");

10
engines/groovie/music.cpp
View File

@ -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);

6
engines/groovie/music.h
View File

@ -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();