libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-07 10:48:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GROOVIE: Rename MusicPlayerMac to MusicPlayerMac_t7g

Browse Source
This commit is contained in:
Matthew Hoops 2012-09-09 12:43:29 -04:00
parent 9780c8e56e
commit 72a1140d57
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/groovie/groovie.cpp
View File

@ -163,7 +163,7 @@ Common::Error GroovieEngine::run() {
// TODO: The 11th Hour Mac uses QuickTime MIDI files
// Right now, since the XMIDI are present and it is still detected as
// the DOS version, we don't have to do anything here.
_musicPlayer = new MusicPlayerMac(this);
_musicPlayer = new MusicPlayerMac_t7g(this);
break;
case Common::kPlatformIOS:
_musicPlayer = new MusicPlayerIOS(this);

8
engines/groovie/music.cpp
View File

@ -678,9 +678,9 @@ void MusicPlayerXMI::setTimbreMT(byte channel, const Timbre &timbre) {
}
// MusicPlayerMac
// MusicPlayerMac_t7g
MusicPlayerMac::MusicPlayerMac(GroovieEngine *vm) : MusicPlayerMidi(vm) {
MusicPlayerMac_t7g::MusicPlayerMac_t7g(GroovieEngine *vm) : MusicPlayerMidi(vm) {
// Create the parser
_midiParser = MidiParser::createParser_SMF();
@ -701,7 +701,7 @@ MusicPlayerMac::MusicPlayerMac(GroovieEngine *vm) : MusicPlayerMidi(vm) {
assert(_vm->_macResFork);
}
bool MusicPlayerMac::load(uint32 fileref, bool loop) {
bool MusicPlayerMac_t7g::load(uint32 fileref, bool loop) {
debugC(1, kGroovieDebugMIDI | kGroovieDebugAll, "Groovie::Music: Starting the playback of song: %04X", fileref);
// First try for compressed MIDI
@ -722,7 +722,7 @@ bool MusicPlayerMac::load(uint32 fileref, bool loop) {
return loadParser(file, loop);
}
Common::SeekableReadStream *MusicPlayerMac::decompressMidi(Common::SeekableReadStream *stream) {
Common::SeekableReadStream *MusicPlayerMac_t7g::decompressMidi(Common::SeekableReadStream *stream) {
// Initialize an output buffer of the given size
uint32 size = stream->readUint32BE();
byte *output = (byte *)malloc(size);

4
engines/groovie/music.h
View File

@ -150,9 +150,9 @@ private:
void setTimbreMT(byte channel, const Timbre &timbre);
};
class MusicPlayerMac : public MusicPlayerMidi {
class MusicPlayerMac_t7g : public MusicPlayerMidi {
public:
MusicPlayerMac(GroovieEngine *vm);
MusicPlayerMac_t7g(GroovieEngine *vm);
protected:
bool load(uint32 fileref, bool loop);