[Scummvm-cvs-logs] scummvm master -> 3ad35f760c25aed3036f691c75ebc79d7cbcacae

[Kirben]

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:
3ad35f760c MADE: Limit Miles audio to Return to Zork only, and enable Adlib support.


Commit: 3ad35f760c25aed3036f691c75ebc79d7cbcacae
    https://github.com/scummvm/scummvm/commit/3ad35f760c25aed3036f691c75ebc79d7cbcacae
Author: Kirben (kirben at optusnet.com.au)
Date: 2015-07-02T23:05:50+10:00

Commit Message:
MADE: Limit Miles audio to Return to Zork only, and enable Adlib support.

Changed paths:
    engines/made/made.cpp
    engines/made/music.cpp
    engines/made/music.h



diff --git a/engines/made/made.cpp b/engines/made/made.cpp
index af8156f..ab07ef7 100644
--- a/engines/made/made.cpp
+++ b/engines/made/made.cpp
@@ -275,7 +275,7 @@ void MadeEngine::handleEvents() {
 }
 
 Common::Error MadeEngine::run() {
-	_music = new MusicPlayer();
+	_music = new MusicPlayer(getGameID() == GID_RTZ);
 	syncSoundSettings();
 
 	// Initialize backend
diff --git a/engines/made/music.cpp b/engines/made/music.cpp
index b11f071..6e5acb8 100644
--- a/engines/made/music.cpp
+++ b/engines/made/music.cpp
@@ -32,25 +32,26 @@
 
 namespace Made {
 
-MusicPlayer::MusicPlayer() : _isGM(false),_milesAudioMode(false) {
-	MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MT32);
-	MusicType musicType  = MidiDriver::getMusicType(dev);
-
-	switch (musicType) {
-	case MT_ADLIB:
-		// Adlib disabled due to known issues
-		//_milesAudioMode = true;
-		//_driver = Audio::MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.AD");
-		MidiPlayer::createDriver();
-		break;
-	case MT_MT32:
-		_milesAudioMode = true;
-		_driver = Audio::MidiDriver_Miles_MT32_create("");
-		break;
-	default:
-		_milesAudioMode = false;
-		MidiPlayer::createDriver();
-		break;
+MusicPlayer::MusicPlayer(bool milesAudio) : _isGM(false),_milesAudioMode(false) {
+	if (milesAudio) {
+		MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MT32);
+		MusicType musicType  = MidiDriver::getMusicType(dev);
+		switch (musicType) {
+		case MT_ADLIB:
+			_milesAudioMode = true;
+			_driver = Audio::MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.AD");
+			break;
+		case MT_MT32:
+			_milesAudioMode = true;
+			_driver = Audio::MidiDriver_Miles_MT32_create("");
+			break;
+		default:
+			_milesAudioMode = false;
+			MidiPlayer::createDriver();
+			break;
+		}
+	} else {
+			MidiPlayer::createDriver();
 	}
 
 	int ret = _driver->open();
diff --git a/engines/made/music.h b/engines/made/music.h
index 9c92cd0..558b41c 100644
--- a/engines/made/music.h
+++ b/engines/made/music.h
@@ -38,7 +38,7 @@ enum MusicFlags {
 
 class MusicPlayer : public Audio::MidiPlayer {
 public:
-	MusicPlayer();
+	MusicPlayer(bool milesAudio);
 
 	void playXMIDI(GenericResource *midiResource, MusicFlags flags = MUSIC_NORMAL);
 	void playSMF(GenericResource *midiResource, MusicFlags flags = MUSIC_NORMAL);