[Scummvm-cvs-logs] SF.net SVN: scummvm:[43171] scummvm/trunk/engines/cruise

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sun Aug 9 14:23:02 CEST 2009


Revision: 43171
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43171&view=rev
Author:   dreammaster
Date:     2009-08-09 12:23:01 +0000 (Sun, 09 Aug 2009)

Log Message:
-----------
Removed redundant code related to Midi handling

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/cruise.cpp
    scummvm/trunk/engines/cruise/cruise.h

Modified: scummvm/trunk/engines/cruise/cruise.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise.cpp	2009-08-09 12:19:55 UTC (rev 43170)
+++ scummvm/trunk/engines/cruise/cruise.cpp	2009-08-09 12:23:01 UTC (rev 43171)
@@ -124,18 +124,6 @@
 	// another bit of video init
 
 	readVolCnf();
-
-	// Setup mixer
-//	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
-//	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
-
-	int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
-	_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
-	_adlib = (midiDriver == MD_ADLIB);
-
-	_driver = MidiDriver::createMidi(midiDriver);
-	if (_mt32)
-		_driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
 }
 
 void CruiseEngine::deinitialise() {

Modified: scummvm/trunk/engines/cruise/cruise.h
===================================================================
--- scummvm/trunk/engines/cruise/cruise.h	2009-08-09 12:19:55 UTC (rev 43170)
+++ scummvm/trunk/engines/cruise/cruise.h	2009-08-09 12:23:01 UTC (rev 43171)
@@ -56,9 +56,7 @@
 private:
 	bool _preLoad;
 	Debugger *_debugger;
-	MidiDriver *_driver;
 	PCSound *_sound;
-	bool _mt32, _adlib;
 	Common::StringList _langStrings;
 	CursorType _savedCursor;
 	uint32 lastTick, lastTickDebug;
@@ -89,8 +87,6 @@
 	Common::Language getLanguage() const;
 	Common::Platform getPlatform() const;
 	PCSound &sound() { return *_sound; }
-	bool mt32() const { return _mt32; }
-	bool adlib() const { return _adlib; }
 	virtual GUI::Debugger *getDebugger() { return _debugger; }
 	virtual void pauseEngine(bool pause);
 	const char *langString(LangStringId langId) { return _langStrings[(int)langId].c_str(); }


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




More information about the Scummvm-git-logs mailing list