Address comments

Author: oddbookworm

docs/reST/ref/mixer.rst

@@ -515,6 +515,9 @@ The following file formats are supported
       original Sound. If the copy fails, a ``TypeError`` or :meth:`pygame.error`
       exception will be raised.
 
+      If copying a subclass of ``mixer.Sound``, an instance of the same subclass
+      will be returned.
+
       Also note that this functions as ``Sound.__copy__``.
 
       .. versionadded:: 2.5.6

src_c/mixer.c

@@ -808,7 +808,7 @@ snd_copy(PyObject *self, PyObject *_null)
     MIXER_INIT_CHECK();
 
     pgSoundObject *newSound =
-        (pgSoundObject *)Py_TYPE(self)->tp_new(&pgSound_Type, NULL, NULL);
+        (pgSoundObject *)Py_TYPE(self)->tp_new(Py_TYPE(self), NULL, NULL);
 
     PyObject *kwargs = PyDict_New();
     PyObject *key = PyUnicode_FromString("buffer");
@@ -843,6 +843,15 @@ snd_copy(PyObject *self, PyObject *_null)
         return NULL;
     }
 
+    // Preserve original volume on the new chunk
+    Mix_Chunk *orig = pgSound_AsChunk(self);
+    Mix_Chunk *dst = pgSound_AsChunk((PyObject *)newSound);
+
+    if (orig && dst) {
+        int vol = Mix_VolumeChunk(orig, -1);
+        Mix_VolumeChunk(dst, vol);
+    }
+
     Py_DECREF(kwargs);
     return (PyObject *)newSound;
 }

test/mixer_test.py

@@ -1331,6 +1331,10 @@ def __init__(self):
         self.assertRaises(RuntimeError, incorrect.get_volume)
 
     def test_snd_copy(self):
+        class SubSound(mixer.Sound):
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
         mixer.init()
 
         filenames = [
@@ -1340,22 +1344,55 @@ def test_snd_copy(self):
             "house_lo.opus",
             "surfonasinewave.xm",
         ]
+        old_volumes = [0.1, 0.2, 0.5, 0.7, 1.0]
+        new_volumes = [0.2, 0.3, 0.7, 1.0, 0.1]
         if pygame.mixer.get_sdl_mixer_version() >= (2, 6, 0):
             filenames.append("house_lo.mp3")
 
-        for f in filenames:
+        for f, old_vol, new_vol in zip(filenames, old_volumes, new_volumes):
             filename = example_path(os.path.join("data", f))
             try:
                 sound = mixer.Sound(file=filename)
+                sound.set_volume(old_vol)
+            except pygame.error:
+                continue
+            sound_copy = sound.copy()
+            self.assertEqual(sound.get_length(), sound_copy.get_length())
+            self.assertEqual(sound.get_num_channels(), sound_copy.get_num_channels())
+            self.assertEqual(sound.get_volume(), sound_copy.get_volume())
+            self.assertEqual(sound.get_raw(), sound_copy.get_raw())
+
+            sound.set_volume(new_vol)
+            self.assertNotEqual(sound.get_volume(), sound_copy.get_volume())
+
+            del sound
+
+            # Test on the copy for playable sounds
+            channel = sound_copy.play()
+            if channel is None:
+                continue
+            self.assertTrue(channel.get_busy())
+            sound_copy.stop()
+            self.assertFalse(channel.get_busy())
+            sound_copy.play()
+            self.assertEqual(sound_copy.get_num_channels(), 1)
+
+        # Test copying a subclass of Sound
+        for f, old_vol, new_vol in zip(filenames, old_volumes, new_volumes):
+            filename = example_path(os.path.join("data", f))
+            try:
+                sound = SubSound(file=filename)
+                sound.set_volume(old_vol)
             except pygame.error:
                 continue
             sound_copy = sound.copy()
+            self.assertTrue(sound_copy, SubSound)
             self.assertEqual(sound.get_length(), sound_copy.get_length())
             self.assertEqual(sound.get_num_channels(), sound_copy.get_num_channels())
             self.assertEqual(sound.get_volume(), sound_copy.get_volume())
             self.assertEqual(sound.get_raw(), sound_copy.get_raw())
 
-            sound.set_volume(0.5)
+            sound.set_volume(new_vol)
             self.assertNotEqual(sound.get_volume(), sound_copy.get_volume())
 
             del sound