aboutsummaryrefslogtreecommitdiff
path: root/engines/groovie
diff options
context:
space:
mode:
authorMatthew Hoops2012-09-09 12:43:29 -0400
committerMatthew Hoops2012-09-09 12:43:29 -0400
commit72a1140d572ce46a820cddb6ac85b748cb7a066d (patch)
tree0b4bf6d35a8bdbbeaad248721d970c455fa28a90 /engines/groovie
parent9780c8e56e01308b1b4c5e97079c0320bb308845 (diff)
downloadscummvm-rg350-72a1140d572ce46a820cddb6ac85b748cb7a066d.tar.gz
scummvm-rg350-72a1140d572ce46a820cddb6ac85b748cb7a066d.tar.bz2
scummvm-rg350-72a1140d572ce46a820cddb6ac85b748cb7a066d.zip
GROOVIE: Rename MusicPlayerMac to MusicPlayerMac_t7g
Diffstat (limited to 'engines/groovie')
-rw-r--r--engines/groovie/groovie.cpp2
-rw-r--r--engines/groovie/music.cpp8
-rw-r--r--engines/groovie/music.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index 726e7cbede..42501afa02 100644
--- a/engines/groovie/groovie.cpp
+++ b/engines/groovie/groovie.cpp
@@ -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);
diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index af929d439b..b4afca527f 100644
--- a/engines/groovie/music.cpp
+++ b/engines/groovie/music.cpp
@@ -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);
diff --git a/engines/groovie/music.h b/engines/groovie/music.h
index cc852aa8dc..0342bf16c9 100644
--- a/engines/groovie/music.h
+++ b/engines/groovie/music.h
@@ -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);