diff options
| author | Alyssa Milburn | 2011-08-17 09:28:51 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-08-17 09:28:51 +0200 |
| commit | ae287ccee58ebf68ab6125e5bbb4d8a44874330e (patch) | |
| tree | 2f4cee4b2940466b8a578962e0174c6f89077a40 /engines/agi/sound_midi.cpp | |
| parent | f5255288eabc0527c4c6b727a9db6b8d09a31206 (diff) | |
| parent | e36832bbf84cba88fe6b17e1634fab0d550f13df (diff) | |
| download | scummvm-rg350-ae287ccee58ebf68ab6125e5bbb4d8a44874330e.tar.gz scummvm-rg350-ae287ccee58ebf68ab6125e5bbb4d8a44874330e.tar.bz2 scummvm-rg350-ae287ccee58ebf68ab6125e5bbb4d8a44874330e.zip | |
Merge remote-tracking branch 'origin/master' into soccer
Conflicts:
engines/scumm/he/logic_he.cpp
engines/scumm/he/logic_he.h
Diffstat (limited to 'engines/agi/sound_midi.cpp')
| -rw-r--r-- | engines/agi/sound_midi.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/agi/sound_midi.cpp b/engines/agi/sound_midi.cpp index 0cbaa4af86..47d354093b 100644 --- a/engines/agi/sound_midi.cpp +++ b/engines/agi/sound_midi.cpp @@ -69,7 +69,7 @@ MIDISound::MIDISound(uint8 *data, uint32 len, int resnum, SoundMgr &manager) : A warning("Error creating MIDI sound from resource %d (Type %d, length %d)", resnum, _type, len); } -SoundGenMIDI::SoundGenMIDI(AgiEngine *vm, Audio::Mixer *pMixer) : SoundGen(vm, pMixer), _isGM(false) { +SoundGenMIDI::SoundGenMIDI(AgiBase *vm, Audio::Mixer *pMixer) : SoundGen(vm, pMixer), _isGM(false) { MidiPlayer::createDriver(MDT_MIDI | MDT_ADLIB); int ret = _driver->open(); |