Merged revisions 32744-32745,32747,32750-32759,32762-32764,32769,32777,32783,32785-32786,32789-32791,32798-32799,32801-32807,32809-32812,32816-32817,32819-32821,32823-32830,32832-32836,32838-32844,32846-32850,32852-32854,32858-32859,32865-32868,32873-32874,32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33051

4 files changed, 8 insertions, 12 deletions

diff --git a/engines/touche/midi.cpp b/engines/touche/midi.cpp
index ce62849d2f..d77dbf5bfa 100644
--- a/engines/touche/midi.cpp
+++ b/engines/touche/midi.cpp
@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/config-manager.h"
 #include "common/stream.h"
 
 #include "sound/midiparser.h"
@@ -31,9 +32,8 @@
 
 namespace Touche {
 
-MidiPlayer::MidiPlayer(MidiDriver *driver, bool nativeMT32)
-	: _driver(driver), _parser(0), _midiData(0), _isLooping(false), _isPlaying(false), _masterVolume(0), _nativeMT32(nativeMT32) {
-	assert(_driver);
+MidiPlayer::MidiPlayer()
+	: _driver(0), _parser(0), _midiData(0), _isLooping(false), _isPlaying(false), _masterVolume(0) {
 	memset(_channelsTable, 0, sizeof(_channelsTable));
 	memset(_channelsVolume, 0, sizeof(_channelsVolume));
 	open();
@@ -92,6 +92,9 @@ void MidiPlayer::setVolume(int volume) {
 }
 
 int MidiPlayer::open() {
+	int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+	_nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
+	_driver = MidiDriver::createMidi(midiDriver);
 	int ret = _driver->open();
 	if (ret == 0) {
 		_parser = MidiParser::createParser_SMF();
diff --git a/engines/touche/midi.h b/engines/touche/midi.h
index 3b128593db..a518a4bb29 100644
--- a/engines/touche/midi.h
+++ b/engines/touche/midi.h
@@ -46,7 +46,7 @@ public:
 		NUM_CHANNELS = 16
 	};
 
-	MidiPlayer(MidiDriver *driver, bool nativeMT32);
+	MidiPlayer();
 	~MidiPlayer();
 
 	void play(Common::ReadStream &stream, int size, bool loop = false);
diff --git a/engines/touche/saveload.cpp b/engines/touche/saveload.cpp
index 0fa09d5b7a..c96a28bc8e 100644
--- a/engines/touche/saveload.cpp
+++ b/engines/touche/saveload.cpp
@@ -200,9 +200,6 @@ static void saveOrLoad(S &s, ProgramPointData &data) {
 	saveOrLoad(s, data.order);
 }
 
-template <class S, class A>
-static void saveOrLoadCommonArray(S &s, A &array);
-
 template <class A>
 static void saveOrLoadCommonArray(Common::WriteStream &stream, A &array) {
 	uint count = array.size();
diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index cb8080effd..a4a9b7df92 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -91,11 +91,7 @@ int ToucheEngine::init() {
 
 	setupOpcodes();
 
-	int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
-	bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
-	MidiDriver *driver = MidiDriver::createMidi(midiDriver);
-	_midiPlayer = new MidiPlayer(driver, native_mt32);
-
+	_midiPlayer = new MidiPlayer;
 
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));