diff options
| author | Max Horn | 2011-03-25 11:13:43 +0100 |
|---|---|---|
| committer | Max Horn | 2011-03-25 14:15:43 +0100 |
| commit | 6bf4745a1bdd2116702e8b53107315ed621c6627 (patch) | |
| tree | ab100edd79e7122b863beea59fb3de4700a53fea | |
| parent | bd637b4c5c159c2eeefe14634a7c227c1e2df800 (diff) | |
| download | scummvm-rg350-6bf4745a1bdd2116702e8b53107315ed621c6627.tar.gz scummvm-rg350-6bf4745a1bdd2116702e8b53107315ed621c6627.tar.bz2 scummvm-rg350-6bf4745a1bdd2116702e8b53107315ed621c6627.zip | |
HUGO: Move MidiDriver creation into MidiPlayer constructor
| -rw-r--r-- | engines/hugo/sound.cpp | 10 | ||||
| -rw-r--r-- | engines/hugo/sound.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/hugo/sound.cpp b/engines/hugo/sound.cpp index 04da0c89ee..f0a08829ed 100644 --- a/engines/hugo/sound.cpp +++ b/engines/hugo/sound.cpp @@ -47,8 +47,11 @@ namespace Hugo { -MidiPlayer::MidiPlayer(MidiDriver *driver) +MidiPlayer::MidiPlayer() : _midiData(0) { + + MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM); + _driver = MidiDriver::createMidi(dev); assert(_driver); _paused = false; } @@ -158,10 +161,7 @@ void MidiPlayer::timerCallback(void *p) { } SoundHandler::SoundHandler(HugoEngine *vm) : _vm(vm) { - MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM); - MidiDriver *driver = MidiDriver::createMidi(dev); - - _midiPlayer = new MidiPlayer(driver); + _midiPlayer = new MidiPlayer(); _speakerStream = new Audio::PCSpeaker(_vm->_mixer->getOutputRate()); _vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_speakerHandle, _speakerStream, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true); diff --git a/engines/hugo/sound.h b/engines/hugo/sound.h index b8a7bf9678..f3a141ac1e 100644 --- a/engines/hugo/sound.h +++ b/engines/hugo/sound.h @@ -41,7 +41,7 @@ namespace Hugo { class MidiPlayer : public Audio::MidiPlayer { public: - MidiPlayer(MidiDriver *driver); + MidiPlayer(); ~MidiPlayer(); void pause(bool p); |