all repos — mgba @ 59b48aaadec8c682a9319222043d36288d26e16f

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

59b48aaadec8c682a9319222043d36288d26e16f

parent

e992a5cb6b6840dc1ff6768141d817b8cdcf1b8a

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

jump to
M CHANGES → CHANGES 
@@ -4,6 +4,7 @@ - GB Audio: Fix initial sweep state
  - GB Audio: Fix deserializing audio channels 2 and 3
  - 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 Hardware: Fix GB Player detection on big endian platforms
  - GBA Video: Invalidate map cache when modifying BGCNT (fixes mgba.io/i/1846)
 Other fixes:
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);