Merge remote-tracking branch 'origin/master' into cdrom_changes

src/sound/openal.c

@@ -278,7 +278,7 @@ givealbuffer_common(const void *buf, const uint8_t src, const int size, const in
 
     alGetSourcei(source[src], AL_BUFFERS_PROCESSED, &processed);
     if (processed >= 1) {
-        const double gain = pow(10.0, (double) sound_gain / 20.0);
+        const double gain = sound_muted ? 0.0 : pow(10.0, (double) sound_gain / 20.0);
         alListenerf(AL_GAIN, (float) gain);
 
         alSourceUnqueueBuffers(source[src], 1, &buffer);

src/sound/snd_audiopci.c

@@ -39,6 +39,7 @@
 #include <86box/pci.h>
 #include <86box/snd_ac97.h>
 #include <86box/sound.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/plat_unused.h>
 #include <86box/snd_akm4531.h>

src/sound/snd_gus.c

@@ -15,6 +15,7 @@
 #include <86box/nmi.h>
 #include <86box/pic.h>
 #include <86box/sound.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #ifdef USE_GUSMAX
 #    include <86box/snd_ad1848.h>

src/sound/snd_opl_esfm.c

@@ -32,6 +32,7 @@
 #include <86box/86box.h>
 #include <86box/sound.h>
 #include <86box/device.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/snd_opl.h>
 #include <86box/plat_unused.h>

src/sound/snd_opl_nuked.c

@@ -46,6 +46,7 @@
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/sound.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/device.h>
 #include <86box/snd_opl.h>

src/sound/snd_sb.c

@@ -39,6 +39,7 @@
 #include <86box/pic.h>
 #include <86box/rom.h>
 #include <86box/sound.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/snd_sb.h>
 #include <86box/plat_unused.h>

src/sound/xaudio2.c

@@ -245,7 +245,7 @@ givealbuffer_common(const void *buf, IXAudio2SourceVoice *sourcevoice, const siz
     if (!initialized)
         return;
 
-    (void) IXAudio2MasteringVoice_SetVolume(mastervoice, pow(10.0, (double) sound_gain / 20.0),
+    (void) IXAudio2MasteringVoice_SetVolume(mastervoice, sound_muted ? 0.0 : pow(10.0, (double) sound_gain / 20.0),
                                             XAUDIO2_COMMIT_NOW);
     XAUDIO2_BUFFER buffer = { 0 };
     buffer.Flags          = 0;