Follow SDL's behaviour on negative values and values greater than the…

… max + add tests for that
pygame-community · Sep 5, 2024 · b465075 · b465075
1 parent 865db9a
commit b465075
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/src_c/mixer.c b/src_c/mixer.c
@@ -756,7 +756,9 @@ snd_set_volume(PyObject *self, PyObject *args)
 
     MIXER_INIT_CHECK();
 
-    ((pgSoundObject *)self)->volume = volume;
+    if (volume >= 0.0f) {
+        ((pgSoundObject *)self)->volume = MIN(volume, 1.0f);
+    }
 
     Mix_VolumeChunk(chunk, (int)(volume * 128));
     Py_RETURN_NONE;
@@ -1275,7 +1277,9 @@ chan_set_volume(PyObject *self, PyObject *args)
         volume = 1.0f;
     }
 
-    channeldata[channelnum].volume = volume;
+    if (volume >= 0.0f) {
+        channeldata[channelnum].volume = MIN(volume, 1.0f);
+    }
 
 #ifdef Py_DEBUG
     result =

diff --git a/test/mixer_test.py b/test/mixer_test.py
@@ -921,6 +921,25 @@ def test_set_volume(self):
         ch.set_volume(0.0)
         self.assertAlmostEqual(ch.get_volume(), 0.0)
 
+        ch.set_volume(0.5)
+        self.assertAlmostEqual(ch.get_volume(), 0.5)
+        ch.set_volume(-0.1)
+        self.assertAlmostEqual(ch.get_volume(), 0.5)
+        ch.set_volume(-5)
+        self.assertAlmostEqual(ch.get_volume(), 0.5)
+
+        ch.set_volume(0.99)
+        self.assertAlmostEqual(ch.get_volume(), 0.99)
+        ch.set_volume(1.0)
+        self.assertAlmostEqual(ch.get_volume(), 1.0)
+        ch.set_volume(1.1)
+        self.assertAlmostEqual(ch.get_volume(), 1.0)
+        ch.set_volume(3)
+        self.assertAlmostEqual(ch.get_volume(), 1.0)
+
+        ch.set_volume(-0.5)
+        self.assertAlmostEqual(ch.get_volume(), 1.0)
+
         for volume_1000x in range(0, 1_000 + 1):
             set_volume = volume_1000x / 1_000
 
@@ -1271,6 +1290,25 @@ def test_set_volume_exact(self):
         snd.set_volume(0.0)
         self.assertAlmostEqual(snd.get_volume(), 0.0)
 
+        snd.set_volume(0.5)
+        self.assertAlmostEqual(snd.get_volume(), 0.5)
+        snd.set_volume(-0.1)
+        self.assertAlmostEqual(snd.get_volume(), 0.5)
+        snd.set_volume(-5)
+        self.assertAlmostEqual(snd.get_volume(), 0.5)
+
+        snd.set_volume(0.99)
+        self.assertAlmostEqual(snd.get_volume(), 0.99)
+        snd.set_volume(1.0)
+        self.assertAlmostEqual(snd.get_volume(), 1.0)
+        snd.set_volume(1.1)
+        self.assertAlmostEqual(snd.get_volume(), 1.0)
+        snd.set_volume(3)
+        self.assertAlmostEqual(snd.get_volume(), 1.0)
+
+        snd.set_volume(-0.5)
+        self.assertAlmostEqual(snd.get_volume(), 1.0)
+
         for volume_1000x in range(0, 1_000 + 1):
             set_volume = volume_1000x / 1_000