diff options
| author | Max Horn | 2009-12-09 18:12:51 +0000 |
|---|---|---|
| committer | Max Horn | 2009-12-09 18:12:51 +0000 |
| commit | c8873d8492ef8ae288e870b37c1c85f3b291d62c (patch) | |
| tree | e9902f85422741542ea12f21c17824eab542a5fe /engines/sci/sfx | |
| parent | 84f3c98fad7d351611c879dddc86cd309b4f5281 (diff) | |
| download | scummvm-rg350-c8873d8492ef8ae288e870b37c1c85f3b291d62c.tar.gz scummvm-rg350-c8873d8492ef8ae288e870b37c1c85f3b291d62c.tar.bz2 scummvm-rg350-c8873d8492ef8ae288e870b37c1c85f3b291d62c.zip | |
Changed MidiDriver::createMidi to take a MidiDriverType instead of an int
svn-id: r46316
Diffstat (limited to 'engines/sci/sfx')
| -rw-r--r-- | engines/sci/sfx/music.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/sfx/music.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/sci/sfx/music.cpp b/engines/sci/sfx/music.cpp index ad0fe25b00..ea3ab28e63 100644 --- a/engines/sci/sfx/music.cpp +++ b/engines/sci/sfx/music.cpp @@ -252,7 +252,7 @@ void SciMusic::loadPatchMT32() { } } //---------------------------------------- -void SciMusic::soundInitSnd(SoundRes*res, sciSound *pSnd) { +void SciMusic::soundInitSnd(SoundRes *res, sciSound *pSnd) { //_mutex.lock(); SoundRes::tagTrack *pTrack = NULL; switch (_midiType) { @@ -268,6 +268,8 @@ void SciMusic::soundInitSnd(SoundRes*res, sciSound *pSnd) { case MD_MT32: pTrack = res->getTrackByType(SoundRes::kTrackMT32); break; + default: + break; } // attempting to select default MT-32/Roland track if (!pTrack) diff --git a/engines/sci/sfx/music.h b/engines/sci/sfx/music.h index 26aa2d2bb9..71729881e6 100644 --- a/engines/sci/sfx/music.h +++ b/engines/sci/sfx/music.h @@ -163,7 +163,7 @@ protected: Audio::Mixer *_pMixer; MidiDriver *_pMidiDrv; - int _midiType; + MidiDriverType _midiType; Common::Mutex _mutex; Common::Array<sciSound *> _playList; |