diff options
author | Paul Gilbert | 2009-08-09 12:23:01 +0000 |
---|---|---|
committer | Paul Gilbert | 2009-08-09 12:23:01 +0000 |
commit | a9e55b2f9115c3b61ab4bfdce10043ecff653762 (patch) | |
tree | 1c8eeb0e39ac7ddbd6c45037f0d49cf1ec663a3a | |
parent | b1a3bc9ca4286a52d97992723100fece10d9cd38 (diff) | |
download | scummvm-rg350-a9e55b2f9115c3b61ab4bfdce10043ecff653762.tar.gz scummvm-rg350-a9e55b2f9115c3b61ab4bfdce10043ecff653762.tar.bz2 scummvm-rg350-a9e55b2f9115c3b61ab4bfdce10043ecff653762.zip |
Removed redundant code related to Midi handling
svn-id: r43171
-rw-r--r-- | engines/cruise/cruise.cpp | 12 | ||||
-rw-r--r-- | engines/cruise/cruise.h | 4 |
2 files changed, 0 insertions, 16 deletions
diff --git a/engines/cruise/cruise.cpp b/engines/cruise/cruise.cpp index 7abf83f054..1286c38ff3 100644 --- a/engines/cruise/cruise.cpp +++ b/engines/cruise/cruise.cpp @@ -124,18 +124,6 @@ void CruiseEngine::initialize() { // 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() { diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h index af098b4997..574017dfc7 100644 --- a/engines/cruise/cruise.h +++ b/engines/cruise/cruise.h @@ -56,9 +56,7 @@ class CruiseEngine: public Engine { private: bool _preLoad; Debugger *_debugger; - MidiDriver *_driver; PCSound *_sound; - bool _mt32, _adlib; Common::StringList _langStrings; CursorType _savedCursor; uint32 lastTick, lastTickDebug; @@ -89,8 +87,6 @@ public: 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(); } |