Make sounds aware of target

Author: adazem009

include/scratchcpp/sound.h

@@ -9,6 +9,7 @@
 namespace libscratchcpp
 {
 
+class Target;
 class SoundPrivate;
 
 /*! \brief The Sound class represents a Scratch sound. */
@@ -32,6 +33,9 @@ class LIBSCRATCHCPP_EXPORT Sound : public Asset
 
         virtual bool isPlaying();
 
+        Target *target() const;
+        void setTarget(Target *target);
+
         std::shared_ptr<Sound> clone() const;
 
     protected:

src/scratch/sound.cpp

@@ -62,6 +62,18 @@ bool Sound::isPlaying()
     return impl->player->isPlaying();
 }
 
+/*! Returns the sprite or stage this variable belongs to. */
+Target *Sound::target() const
+{
+    return impl->target;
+}
+
+/*! Sets the sprite or stage this variable belongs to. */
+void Sound::setTarget(Target *target)
+{
+    impl->target = target;
+}
+
 /*! 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
 {

src/scratch/sound_p.h

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

src/scratch/target.cpp

@@ -344,8 +344,10 @@ int Target::addSound(std::shared_ptr<Sound> sound)
 
     assert(sound);
 
-    if (sound)
+    if (sound) {
+        sound->setTarget(this);
         sound->setVolume(impl->volume);
+    }
 
     impl->sounds.push_back(sound);
     return impl->sounds.size() - 1;

test/assets/sound_test.cpp

@@ -1,4 +1,5 @@
 #include <scratchcpp/sound.h>
+#include <scratchcpp/target.h>
 #include <scratch/sound_p.h>
 #include <audiooutputmock.h>
 #include <audioplayermock.h>
@@ -106,6 +107,16 @@ TEST_F(SoundTest, IsPlaying)
     SoundPrivate::audioOutput = nullptr;
 }
 
+TEST_F(SoundTest, Target)
+{
+    Sound sound("sound1", "a", "wav");
+    ASSERT_EQ(sound.target(), nullptr);
+
+    Target target;
+    sound.setTarget(&target);
+    ASSERT_EQ(sound.target(), &target);
+}
+
 TEST_F(SoundTest, Clone)
 {
     Sound sound("sound1", "a", "wav");

test/scratch_classes/target_test.cpp

@@ -442,6 +442,10 @@ TEST(TargetTest, Sounds)
     ASSERT_EQ(target.findSound("sound2"), 1);
     ASSERT_EQ(target.findSound("sound3"), 2);
 
+    ASSERT_EQ(s1->target(), &target);
+    ASSERT_EQ(s2->target(), &target);
+    ASSERT_EQ(s3->target(), &target);
+
     SoundPrivate::audioOutput = nullptr;
 }