diff options
| author | Peter Kohaut | 2019-02-10 16:53:25 +0100 |
|---|---|---|
| committer | Peter Kohaut | 2019-02-10 16:55:38 +0100 |
| commit | 1384afd0f6151e5c39e8f4234fd3a3730ef46f49 (patch) | |
| tree | a85a1224ca5e8142b83868e7941b92d085ba1823 /engines/bladerunner/audio_player.cpp | |
| parent | f104cf5903ebdac4b1eba6e6eab67b237a7caa24 (diff) | |
| download | scummvm-rg350-1384afd0f6151e5c39e8f4234fd3a3730ef46f49.tar.gz scummvm-rg350-1384afd0f6151e5c39e8f4234fd3a3730ef46f49.tar.bz2 scummvm-rg350-1384afd0f6151e5c39e8f4234fd3a3730ef46f49.zip | |
BLADERUNNER: Use ScummVM functionality for audio volume management
Diffstat (limited to 'engines/bladerunner/audio_player.cpp')
| -rw-r--r-- | engines/bladerunner/audio_player.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/bladerunner/audio_player.cpp b/engines/bladerunner/audio_player.cpp index 2c4b75cc13..4493a02f59 100644 --- a/engines/bladerunner/audio_player.cpp +++ b/engines/bladerunner/audio_player.cpp @@ -136,7 +136,7 @@ AudioPlayer::AudioPlayer(BladeRunnerEngine *vm) { _tracks[i].stream = nullptr; } - _sfxVolume = 65; + _sfxVolume =BLADERUNNER_ORIGINAL_SETTINGS ? 65 : 100; } AudioPlayer::~AudioPlayer() { @@ -221,7 +221,7 @@ void AudioPlayer::mixerChannelEnded(int channel, void *data) { audioPlayer->remove(channel); } -int AudioPlayer::playAud(const Common::String &name, int volume, int panFrom, int panTo, int priority, byte flags) { +int AudioPlayer::playAud(const Common::String &name, int volume, int panFrom, int panTo, int priority, byte flags, Audio::Mixer::SoundType type) { /* Find first available track or, alternatively, the lowest priority playing track */ int track = -1; int lowestPriority = 1000000; @@ -279,7 +279,7 @@ int AudioPlayer::playAud(const Common::String &name, int volume, int panFrom, in } int channel = _vm->_audioMixer->play( - Audio::Mixer::kPlainSoundType, + type, audioStream, priority, flags & kAudioPlayerLoop, |