Clamp sound effect values in Target

Author: adazem009

src/scratch/sound.cpp

@@ -11,11 +11,6 @@
 
 using namespace libscratchcpp;
 
-static std::unordered_map<Sound::Effect, std::pair<double, double>> EFFECT_RANGE = {
-    { Sound::Effect::Pitch, { -360, 360 } }, // -3 to 3 octaves
-    { Sound::Effect::Pan, { -100, 100 } }    // // 100% left to 100% right
-};
-
 /*! Constructs Sound. */
 Sound::Sound(const std::string &name, const std::string &id, const std::string &format) :
     Asset(name, id, format),
@@ -56,13 +51,6 @@ void Sound::setVolume(double volume)
 /*! Sets the value of the given sound effect. */
 void Sound::setEffect(Effect effect, double value)
 {
-    auto it = EFFECT_RANGE.find(effect);
-
-    if (it == EFFECT_RANGE.cend())
-        return;
-
-    value = std::clamp(value, it->second.first, it->second.second);
-
     switch (effect) {
         case Effect::Pitch: {
             // Convert from linear

src/scratch/target.cpp

@@ -7,6 +7,7 @@
 #include <scratchcpp/block.h>
 #include <scratchcpp/comment.h>
 #include <scratchcpp/iengine.h>
+#include <scratchcpp/igraphicseffect.h>
 
 #include <unordered_set>
 
@@ -16,6 +17,11 @@ using namespace libscratchcpp;
 
 static const std::unordered_set<std::string> RESERVED_NAMES = { "_mouse_", "_stage_", "_edge_", "_myself_", "_random_" };
 
+static std::unordered_map<Sound::Effect, std::pair<double, double>> SOUND_EFFECT_RANGE = {
+    { Sound::Effect::Pitch, { -360, 360 } }, // -3 to 3 octaves
+    { Sound::Effect::Pan, { -100, 100 } }    // // 100% left to 100% right
+};
+
 /*! Constructs target. */
 Target::Target() :
     impl(spimpl::make_unique_impl<TargetPrivate>())
@@ -436,6 +442,12 @@ double Target::soundEffectValue(Sound::Effect effect) const
 /*! Sets the value of the given sound effect. */
 void Target::setSoundEffectValue(Sound::Effect effect, double value)
 {
+    auto it = SOUND_EFFECT_RANGE.find(effect);
+
+    if (it == SOUND_EFFECT_RANGE.cend())
+        return;
+
+    value = std::clamp(value, it->second.first, it->second.second);
     impl->soundEffects[effect] = value;
 
     for (auto sound : impl->sounds) {

test/assets/sound_test.cpp

@@ -84,9 +84,6 @@ TEST_F(SoundTest, SetEffect)
     Sound sound("sound1", "a", "wav");
 
     // Pitch
-    EXPECT_CALL(*m_player, setPitch(0.125));
-    sound.setEffect(Sound::Effect::Pitch, -400);
-
     EXPECT_CALL(*m_player, setPitch(0.125));
     sound.setEffect(Sound::Effect::Pitch, -360);
 
@@ -102,13 +99,7 @@ TEST_F(SoundTest, SetEffect)
     EXPECT_CALL(*m_player, setPitch(8));
     sound.setEffect(Sound::Effect::Pitch, 360);
 
-    EXPECT_CALL(*m_player, setPitch(8));
-    sound.setEffect(Sound::Effect::Pitch, 400);
-
     // Pan
-    EXPECT_CALL(*m_player, setPan(-1));
-    sound.setEffect(Sound::Effect::Pan, -150);
-
     EXPECT_CALL(*m_player, setPan(-1));
     sound.setEffect(Sound::Effect::Pan, -100);
 
@@ -123,9 +114,6 @@ TEST_F(SoundTest, SetEffect)
 
     EXPECT_CALL(*m_player, setPan(1));
     sound.setEffect(Sound::Effect::Pan, 100);
-
-    EXPECT_CALL(*m_player, setPan(1));
-    sound.setEffect(Sound::Effect::Pan, 150);
 }
 
 TEST_F(SoundTest, Start)

test/scratch_classes/target_test.cpp

@@ -519,13 +519,36 @@ TEST(TargetTest, SoundEffects)
     ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pan), 0);
 
     auto s1 = std::make_shared<SoundMock>();
+    EXPECT_CALL(*s1, setVolume);
+    target.addSound(s1);
+
+    EXPECT_CALL(*s1, setEffect(Sound::Effect::Pitch, -360));
+    target.setSoundEffectValue(Sound::Effect::Pitch, -400);
+    ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pitch), -360);
+
+    EXPECT_CALL(*s1, setEffect(Sound::Effect::Pitch, 360));
+    target.setSoundEffectValue(Sound::Effect::Pitch, 400);
+    ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pitch), 360);
+
+    EXPECT_CALL(*s1, setEffect(Sound::Effect::Pan, -100));
+    target.setSoundEffectValue(Sound::Effect::Pan, -200);
+    ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pan), -100);
+
+    EXPECT_CALL(*s1, setEffect(Sound::Effect::Pan, 100));
+    target.setSoundEffectValue(Sound::Effect::Pan, 200);
+    ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pan), 100);
+
+    EXPECT_CALL(*s1, setEffect(Sound::Effect::Pitch, 0));
+    EXPECT_CALL(*s1, setEffect(Sound::Effect::Pan, 0));
+    target.clearSoundEffects();
+    ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pitch), 0);
+    ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pan), 0);
+
     auto s2 = std::make_shared<SoundMock>();
     auto s3 = std::make_shared<SoundMock>();
 
-    EXPECT_CALL(*s1, setVolume);
     EXPECT_CALL(*s2, setVolume);
     EXPECT_CALL(*s3, setVolume);
-    target.addSound(s1);
     target.addSound(s2);
     target.addSound(s3);