diff options
| author | Strangerke | 2013-09-19 00:23:59 +0200 |
|---|---|---|
| committer | Strangerke | 2013-09-19 00:23:59 +0200 |
| commit | 2238db712cf45d1b82d51fcbf31098d6ce9d6da8 (patch) | |
| tree | 6249a730165eed6af1e7e798bc119dba47f1807f | |
| parent | d26a06a970c17c83ab3d8a85f462172edfa9b07f (diff) | |
| download | scummvm-rg350-2238db712cf45d1b82d51fcbf31098d6ce9d6da8.tar.gz scummvm-rg350-2238db712cf45d1b82d51fcbf31098d6ce9d6da8.tar.bz2 scummvm-rg350-2238db712cf45d1b82d51fcbf31098d6ce9d6da8.zip | |
AVALANCHE: Remove useless function, add _soundFl
| -rw-r--r-- | engines/avalanche/sound.cpp | 13 | ||||
| -rw-r--r-- | engines/avalanche/sound.h | 3 |
2 files changed, 5 insertions, 11 deletions
diff --git a/engines/avalanche/sound.cpp b/engines/avalanche/sound.cpp index b031e32af3..7ab94c772c 100644 --- a/engines/avalanche/sound.cpp +++ b/engines/avalanche/sound.cpp @@ -30,6 +30,7 @@ namespace Avalanche { SoundHandler::SoundHandler(AvalancheEngine *vm) : _vm(vm) { + _soundFl = true; _speakerStream = new Audio::PCSpeaker(_vm->_mixer->getOutputRate()); _vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_speakerHandle, _speakerStream, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true); @@ -51,14 +52,7 @@ void SoundHandler::stopSound() { * Turn digitized sound on and off */ void SoundHandler::toggleSound() { -// _vm->_config._soundFl = !_vm->_config._soundFl; -} - -/** - * Initialize for MCI sound and midi - */ -void SoundHandler::initSound() { - //_midiPlayer->open(); + _soundFl = !_soundFl; } void SoundHandler::syncVolume() { @@ -74,8 +68,7 @@ void SoundHandler::syncVolume() { void SoundHandler::playNote(int freq, int length) { // Does the user not want any sound? -// if (!_vm->_config._soundFl || !_vm->_mixer->isReady()) - if (!_vm->_mixer->isReady()) + if (!_soundFl || !_vm->_mixer->isReady()) return; // Start a note playing (we will stop it when the timer expires). diff --git a/engines/avalanche/sound.h b/engines/avalanche/sound.h index d8ffbd7291..a982e98ced 100644 --- a/engines/avalanche/sound.h +++ b/engines/avalanche/sound.h @@ -30,6 +30,8 @@ namespace Avalanche { class SoundHandler { public: + bool _soundFl; + SoundHandler(AvalancheEngine *vm); ~SoundHandler(); @@ -37,7 +39,6 @@ public: void playNote(int freq, int length); void click(); void blip(); - void initSound(); void syncVolume(); private: |