fix #553: Use clone root audio player when cloning sounds

Author: adazem009

src/scratch/sound.cpp

@@ -65,13 +65,15 @@ bool Sound::isPlaying()
 /*! Returns an independent copy of the sound which is valid for as long as the original sound exists. */
 std::shared_ptr<Sound> Sound::clone() const
 {
+    const Sound *root = impl->cloneRoot ? impl->cloneRoot : this;
     auto sound = std::make_shared<Sound>(name(), id(), dataFormat());
     sound->setRate(rate());
     sound->setSampleCount(sampleCount());
+    sound->impl->cloneRoot = root;
     sound->impl->player->setVolume(impl->player->volume());
 
-    if (impl->player->isLoaded()) {
-        sound->impl->player->loadCopy(impl->player.get());
+    if (root->impl->player->isLoaded()) {
+        sound->impl->player->loadCopy(root->impl->player.get());
         sound->setData(dataSize(), const_cast<void *>(data()));
     }
 

src/scratch/sound_p.h

@@ -10,6 +10,8 @@
 namespace libscratchcpp
 {
 
+class Sound;
+
 struct SoundPrivate
 {
         SoundPrivate();
@@ -19,6 +21,7 @@ struct SoundPrivate
         int sampleCount = 0;
         static IAudioOutput *audioOutput;
         std::shared_ptr<IAudioPlayer> player = nullptr;
+        const Sound *cloneRoot = nullptr;
 };
 
 } // namespace libscratchcpp

test/assets/sound_test.cpp

@@ -134,13 +134,23 @@ TEST_F(SoundTest, Clone)
     ASSERT_EQ(clone->rate(), sound.rate());
     ASSERT_EQ(clone->sampleCount(), sound.sampleCount());
 
+    auto cloneClonePlayer = std::make_shared<AudioPlayerMock>();
+    EXPECT_CALL(m_playerFactory, createAudioPlayer()).WillOnce(Return(cloneClonePlayer));
+    EXPECT_CALL(*m_player, isLoaded()).WillOnce(Return(true));
+    EXPECT_CALL(*cloneClonePlayer, loadCopy(m_player.get())).WillOnce(Return(true));
+    EXPECT_CALL(*clonePlayer, volume()).WillOnce(Return(0.62));
+    EXPECT_CALL(*cloneClonePlayer, setVolume(0.62));
+    EXPECT_CALL(*cloneClonePlayer, isLoaded()).WillOnce(Return(true));
+    auto cloneClone = clone->clone();
+    ASSERT_TRUE(cloneClone);
+
     auto anotherClonePlayer = std::make_shared<AudioPlayerMock>();
-    EXPECT_CALL(m_playerFactory, createAudioPlayer()).WillOnce(Return(clonePlayer));
+    EXPECT_CALL(m_playerFactory, createAudioPlayer()).WillOnce(Return(anotherClonePlayer));
     EXPECT_CALL(*m_player, isLoaded()).WillOnce(Return(false));
-    EXPECT_CALL(*clonePlayer, loadCopy).Times(0);
-    EXPECT_CALL(*m_player, volume()).WillOnce(Return(0.62));
-    EXPECT_CALL(*clonePlayer, setVolume(0.62));
-    EXPECT_CALL(*clonePlayer, isLoaded()).Times(0);
-    auto anotherClone = sound.clone();
+    EXPECT_CALL(*anotherClonePlayer, loadCopy).Times(0);
+    EXPECT_CALL(*clonePlayer, volume()).WillOnce(Return(0.62));
+    EXPECT_CALL(*anotherClonePlayer, setVolume(0.62));
+    EXPECT_CALL(*anotherClonePlayer, isLoaded()).Times(0);
+    auto anotherClone = clone->clone();
     ASSERT_TRUE(anotherClone);
 }