[Scummvm-cvs-logs] SF.net SVN: scummvm: [32798] scummvm/trunk/engines/touche

[cyx at users.sourceforge.net]

Revision: 32798
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32798&view=rev
Author:   cyx
Date:     2008-06-26 03:12:12 -0700 (Thu, 26 Jun 2008)

Log Message:
-----------
moved midi driver object creation to MidiPlayer class (to match delete call)

Modified Paths:
--------------
    scummvm/trunk/engines/touche/midi.cpp
    scummvm/trunk/engines/touche/midi.h
    scummvm/trunk/engines/touche/saveload.cpp
    scummvm/trunk/engines/touche/touche.cpp

Modified: scummvm/trunk/engines/touche/midi.cpp
===================================================================
--- scummvm/trunk/engines/touche/midi.cpp	2008-06-26 09:18:41 UTC (rev 32797)
+++ scummvm/trunk/engines/touche/midi.cpp	2008-06-26 10:12:12 UTC (rev 32798)
@@ -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 @@
 }
 
 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();

Modified: scummvm/trunk/engines/touche/midi.h
===================================================================
--- scummvm/trunk/engines/touche/midi.h	2008-06-26 09:18:41 UTC (rev 32797)
+++ scummvm/trunk/engines/touche/midi.h	2008-06-26 10:12:12 UTC (rev 32798)
@@ -46,7 +46,7 @@
 		NUM_CHANNELS = 16
 	};
 
-	MidiPlayer(MidiDriver *driver, bool nativeMT32);
+	MidiPlayer();
 	~MidiPlayer();
 
 	void play(Common::ReadStream &stream, int size, bool loop = false);

Modified: scummvm/trunk/engines/touche/saveload.cpp
===================================================================
--- scummvm/trunk/engines/touche/saveload.cpp	2008-06-26 09:18:41 UTC (rev 32797)
+++ scummvm/trunk/engines/touche/saveload.cpp	2008-06-26 10:12:12 UTC (rev 32798)
@@ -200,9 +200,6 @@
 	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();

Modified: scummvm/trunk/engines/touche/touche.cpp
===================================================================
--- scummvm/trunk/engines/touche/touche.cpp	2008-06-26 09:18:41 UTC (rev 32797)
+++ scummvm/trunk/engines/touche/touche.cpp	2008-06-26 10:12:12 UTC (rev 32798)
@@ -91,12 +91,8 @@
 
 	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"));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, Audio::Mixer::kMaxMixerVolume);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.