diff options
author | Robert Göffringmann | 2003-05-12 23:25:54 +0000 |
---|---|---|
committer | Robert Göffringmann | 2003-05-12 23:25:54 +0000 |
commit | 4162a22121bcf2845b5f3b206f516a1bf6754a3c (patch) | |
tree | 35dabb56d7d30abe9705cc31a6176ecf82d918e1 /sky/sky.cpp | |
parent | 299a1a451fdbde6f7c8bed40596dc3a6786a6c3b (diff) | |
download | scummvm-rg350-4162a22121bcf2845b5f3b206f516a1bf6754a3c.tar.gz scummvm-rg350-4162a22121bcf2845b5f3b206f516a1bf6754a3c.tar.bz2 scummvm-rg350-4162a22121bcf2845b5f3b206f516a1bf6754a3c.zip |
changed some internal structures, added support for true MT32 (though not yet used by main prog)
svn-id: r7483
Diffstat (limited to 'sky/sky.cpp')
-rw-r--r-- | sky/sky.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/sky/sky.cpp b/sky/sky.cpp index 7dcf83861a..cead2b69a3 100644 --- a/sky/sky.cpp +++ b/sky/sky.cpp @@ -110,22 +110,14 @@ void SkyState::initialise(void) { _skySound = new SkySound(_mixer); _skyDisk = new SkyDisk(_gameDataPath); - // FIXME: This is *ugly* (and maybe even incorrect?) - // We need to know if we have to use adlib for midi or not. - - if (_detector->_midi_driver == MD_ADLIB) { - _skyMusic = new SkyAdlibMusic(_mixer, _skyDisk); + if (_detector->getMidiDriverType() == MD_ADLIB) { + _skyMusic = new SkyAdlibMusic(_mixer, _skyDisk); } else { - if (_detector->_midi_driver == MD_AUTO) { -#if defined (_WIN32_WCE) || defined(UNIX) || defined(X11_BACKEND) - _skyMusic = new SkyAdlibMusic(_mixer, _skyDisk); -#else - _skyMusic = new SkyGmMusic(_detector->createMidi(), _skyDisk); -#endif - } else { - _skyMusic = new SkyGmMusic(_detector->createMidi(), _skyDisk); - } + _skyMusic = new SkyGmMusic(_detector->createMidi(), _skyDisk); } + // TODO: Add option for users with real MT32 to use it. Driver is done. + // _skyMusic = new SkyMT32Music(_detector->createMidi(), _skyDisk); + _gameVersion = _skyDisk->determineGameVersion(); _skyText = new SkyText(_skyDisk, _gameVersion, _language); |