ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

AGI: Change the way the mixer volume is handled in the PCjr player

Browse Source 
Instead of factoring the volume into the tone attenuation it now scales
the volume table. This way it still uses the full table when playing
at a low volume and therefore keeps the 16 attenuation levels.

Also use kMusicSoundType instead of kSFXSoundType to be coherent with what
the MIDI output is doing (volume for both music and SFX is controlled by
the Music volume slider).
This commit is contained in:
Thierry Crozat
2015-05-10 16:14:55 +01:00
parent 830f8c42f5
commit 0cb0a09c02
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/agi/sound_pcjr.cpp
+4 -3
View File
@@ -205,7 +205,6 @@ int SoundGenPCJr::volumeCalc(SndGenChan *chan) {
chan->attenuationCopy = attenuation;
attenuation &= 0x0F;
attenuation += (16 - _mixer->getVolumeForSoundType(Audio::Mixer::kSFXSoundType) / 17);
if (attenuation > 0x0F)
attenuation = 0x0F;
}
@@ -475,8 +474,9 @@ int SoundGenPCJr::fillSquare(ToneChan *t, int16 *buf, int len) {
count = len;
int16 amp = (int16)(volTable[t->atten] * _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) / Audio::Mixer::kMaxMixerVolume);
while (count > 0) {
*(buf++) = t->sign ? volTable[t->atten] : -volTable[t->atten];
*(buf++) = t->sign ? amp : -amp;
count--;
// get next sample
@@ -513,8 +513,9 @@ int SoundGenPCJr::fillNoise(ToneChan *t, int16 *buf, int len) {
count = len;
int16 amp = (int16)(volTable[t->atten] * _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) / Audio::Mixer::kMaxMixerVolume);
while (count > 0) {
*(buf++) = t->sign ? volTable[t->atten] : -volTable[t->atten];
*(buf++) = t->sign ? amp : -amp;
count--;
// get next sample