all repos — mgba @ 2a2f208419f7fdf3b5058f74afe8bbf12b52ebc3

mGBA Game Boy Advance Emulator

GBA Audio: Fix volume/mute in XQ audio (fixes #1864)
Vicki Pfau vi@endrift.com
Wed, 19 Aug 2020 15:50:32 -0700
commit

2a2f208419f7fdf3b5058f74afe8bbf12b52ebc3

parent

106685c1cd7624e1ce0aeb378e5fb9459659c658

2 files changed, 3 insertions(+), 0 deletions(-)

jump to
M CHANGES → CHANGES 
@@ -21,6 +21,7 @@ - GB Video: Fix state after skipping BIOS (fixes mgba.io/i/1715 and mgba.io/i/1716)
  - GBA: Fix timing advancing too quickly in rare cases
  - GBA Audio: Fix deserializing SOUNDCNT_L
  - GBA Audio: Fix stereo in XQ audio
+ - GBA Audio: Fix volume/mute in XQ audio (fixes mgba.io/i/1864)
  - GBA BIOS: Implement dummy sound driver calls
  - GBA BIOS: Improve HLE BIOS timing
  - GBA BIOS: Fix reloading video registers after reset (fixes mgba.io/i/1808)
M src/gba/extra/audio-mixer.c → src/gba/extra/audio-mixer.c 
@@ -289,6 +289,8 @@ sample.left += value;
 			CircleBufferRead16(&mixer->activeTracks[track].buffer, &value);
 			sample.right += value;
 		}
+		sample.left = (sample.left * mixer->p->masterVolume) >> 8;
+		sample.right = (sample.right * mixer->p->masterVolume) >> 8;
 		if (mixer->p->externalMixing) {
 			blip_add_delta(mixer->p->psg.left, mixer->p->clock + i * interval, sample.left - mixer->last.left);
 			blip_add_delta(mixer->p->psg.right, mixer->p->clock + i * interval, sample.right - mixer->last.right);