aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Thomas2012-03-24 10:56:36 +1030
committerScott Thomas2012-03-24 11:00:09 +1030
commit19d36330c5b109a0c94f9dfa25592077ec95f76e (patch)
treed55e9a363176ee0220413766792597f7ffdd3457
parent783b917ec617e3fd6374692bee5c13d5807486fa (diff)
downloadscummvm-rg350-19d36330c5b109a0c94f9dfa25592077ec95f76e.tar.gz
scummvm-rg350-19d36330c5b109a0c94f9dfa25592077ec95f76e.tar.bz2
scummvm-rg350-19d36330c5b109a0c94f9dfa25592077ec95f76e.zip
GROOVIE: Detect if external music exists for the Music Enhancement Project.
T7G's music framework uses either all external or all XMIDI, so assume if one external song is present, the entire music pack is.
-rw-r--r--engines/groovie/groovie.cpp32
1 files changed, 19 insertions, 13 deletions
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index f5f02b5cdd..726e7cbede 100644
--- a/engines/groovie/groovie.cpp
+++ b/engines/groovie/groovie.cpp
@@ -152,20 +152,26 @@ Common::Error GroovieEngine::run() {
break;
}
- // Create the music player
- switch (getPlatform()) {
- case Common::kPlatformMacintosh:
- // 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);
- break;
- case Common::kPlatformIOS:
+ // Detect ScummVM Music Enhancement Project presence (T7G only)
+ if (Common::File::exists("gu16.ogg") && _gameDescription->version == kGroovieT7G) {
+ // Load player for external files
_musicPlayer = new MusicPlayerIOS(this);
- break;
- default:
- _musicPlayer = new MusicPlayerXMI(this, _gameDescription->version == kGroovieT7G ? "fat" : "sample");
- break;
+ } else {
+ // Create the music player
+ switch (getPlatform()) {
+ case Common::kPlatformMacintosh:
+ // 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);
+ break;
+ case Common::kPlatformIOS:
+ _musicPlayer = new MusicPlayerIOS(this);
+ break;
+ default:
+ _musicPlayer = new MusicPlayerXMI(this, _gameDescription->version == kGroovieT7G ? "fat" : "sample");
+ break;
+ }
}
// Load volume levels