diff options
| author | Max Horn | 2003-12-24 17:42:22 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-24 17:42:22 +0000 |
| commit | 859a9c01290dc6022f99c7fd99ff91d62a3153dc (patch) | |
| tree | 34a40bd53ce6c75e3685ec837c4da4c0a38d01f7 /scumm/scummvm.cpp | |
| parent | 5665d137f6bae488ac19539acdcfe441f514a9d6 (diff) | |
| download | scummvm-rg350-859a9c01290dc6022f99c7fd99ff91d62a3153dc.tar.gz scummvm-rg350-859a9c01290dc6022f99c7fd99ff91d62a3153dc.tar.bz2 scummvm-rg350-859a9c01290dc6022f99c7fd99ff91d62a3153dc.zip | |
o Added SoundMixer::isReady()
o Removed SoundMixer::bindToSystem()
o In scumm, replaced _silentMixer, _silentDigitalImuse and _noDigitalSamples by SoundMixer::isReady()
svn-id: r11893
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 2efb368831..9c13d60174 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -459,8 +459,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS _defaultTalkDelay = 0; _midiDriver = MD_NULL; tempMusic = 0; - _silentDigitalImuse = 0; - _noDigitalSamples = 0; _saveSound = 0; memset(_extraBoxFlags, 0, sizeof(_extraBoxFlags)); memset(_scaleSlots, 0, sizeof(_scaleSlots)); @@ -707,8 +705,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS #ifndef __GP32__ //ph0x FIXME, "quick dirty hack" /* Bind the mixer to the system => mixer will be invoked * automatically when samples need to be generated */ - _silentDigitalImuse = false; - if (!_mixer->bindToSystem(syst)) { + if (!_mixer->isReady()) { warning("Sound mixer initialization failed"); if (_midiDriver == MD_ADLIB || _midiDriver == MD_PCSPK || @@ -716,8 +713,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS _midiDriver = MD_NULL; warning("MIDI driver depends on sound mixer, switching to null MIDI driver"); } - _silentDigitalImuse = true; - _noDigitalSamples = true; } _mixer->setVolume(ConfMan.getInt("sfx_volume") * ConfMan.getInt("master_volume") / 255); _mixer->setMusicVolume(ConfMan.getInt("music_volume")); |