OPENGL: Merged from trunk, from rev 52105 to 53396.

This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.

Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.

svn-id: r53399

2 files changed, 6 insertions, 1 deletions

diff --git a/engines/made/made.cpp b/engines/made/made.cpp
index 20b4dc1e1b..4b59723772 100644
--- a/engines/made/made.cpp
+++ b/engines/made/made.cpp
@@ -106,6 +106,7 @@ MadeEngine::MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc) : Eng
 
 	_music = new MusicPlayer(driver);
 	_music->setNativeMT32(native_mt32);
+	_music->open();
 	//_music->setAdLib(adlib);
 
 	// Set default sound frequency
diff --git a/engines/made/music.cpp b/engines/made/music.cpp
index bb45367805..4e2789e5fa 100644
--- a/engines/made/music.cpp
+++ b/engines/made/music.cpp
@@ -40,7 +40,6 @@ namespace Made {
 MusicPlayer::MusicPlayer(MidiDriver *driver) : _parser(0), _driver(driver), _looping(false), _isPlaying(false), _passThrough(false), _isGM(false) {
 	memset(_channel, 0, sizeof(_channel));
 	_masterVolume = 0;
-	this->open();
 	_xmidiParser = MidiParser::createParser_XMIDI();
 	_smfParser = MidiParser::createParser_SMF();
 }
@@ -81,6 +80,11 @@ int MusicPlayer::open() {
 	if (ret)
 		return ret;
 
+	if (_nativeMT32)
+		_driver->sendMT32Reset();
+	else
+		_driver->sendGMReset();
+
 	_driver->setTimerCallback(this, &onTimer);
 	return 0;
 }