[Scummvm-cvs-logs] scummvm master -> 19d36330c5b109a0c94f9dfa25592077ec95f76e

[scott-t]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
19d36330c5 GROOVIE: Detect if external music exists for the Music Enhancement Project.


Commit: 19d36330c5b109a0c94f9dfa25592077ec95f76e
    https://github.com/scummvm/scummvm/commit/19d36330c5b109a0c94f9dfa25592077ec95f76e
Author: Scott Thomas (scott_t at users.sourceforge.net)
Date: 2012-03-23T17:30:09-07:00

Commit Message:
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.

Changed paths:
    engines/groovie/groovie.cpp



diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index f5f02b5..726e7cb 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