mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-17 07:07:10 +00:00
SCI: Cleanup
svn-id: r47194
This commit is contained in:
parent
ac7458f916
commit
1e3679b4b6
@ -63,23 +63,9 @@ void SciMusic::init() {
|
||||
// SCI sound init
|
||||
_dwTempo = 0;
|
||||
|
||||
const MidiDriverDescription *md = MidiDriver::findMusicDriver(ConfMan.get("music_driver"));
|
||||
_midiType = md ? md->id : MD_AUTO;
|
||||
MidiDriverType midiType = MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_ADLIB);
|
||||
|
||||
if (_midiType == MD_AUTO)
|
||||
_midiType = MD_ADLIB;
|
||||
|
||||
switch (_midiType) {
|
||||
case MD_ADLIB:
|
||||
case MD_PCJR:
|
||||
case MD_PCSPK:
|
||||
break;
|
||||
default:
|
||||
warning("Unhandled MIDI type, switching to default");
|
||||
_midiType = MD_ADLIB;
|
||||
}
|
||||
|
||||
switch (_midiType) {
|
||||
switch (midiType) {
|
||||
case MD_ADLIB:
|
||||
// FIXME: There's no Amiga sound option, so we hook it up to Adlib
|
||||
if (((SciEngine *)g_engine)->getPlatform() == Common::kPlatformAmiga)
|
||||
@ -96,7 +82,7 @@ void SciMusic::init() {
|
||||
//case MD_MT32:
|
||||
// TODO
|
||||
default:
|
||||
error("Unsupported _midiType setup %d", _midiType);
|
||||
error("Unsupported _midiType setup %d", midiType);
|
||||
}
|
||||
|
||||
if (_pMidiDrv) {
|
||||
|
@ -214,7 +214,6 @@ protected:
|
||||
|
||||
Audio::Mixer *_pMixer;
|
||||
MidiPlayer *_pMidiDrv;
|
||||
MidiDriverType _midiType;
|
||||
|
||||
uint32 _dwTempo;
|
||||
// Mixed Adlib/MIDI mode: when enabled from the ScummVM sound options screen,
|
||||
|
Loading…
Reference in New Issue
Block a user