Skip to content

Commit 363bec1

Browse files
adazem009adazem009
committed
Rename sound effect methods
to match with graphic effects
1 parent 4342271 commit 363bec1

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

‎include/scratchcpp/target.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ class LIBSCRATCHCPP_EXPORT Target
8989
double volume() const;
9090
void setVolume(double newVolume);
9191

92-
virtual double soundEffect(Sound::Effect effect) const;
93-
virtual void setSoundEffect(Sound::Effect effect, double value);
92+
virtual double soundEffectValue(Sound::Effect effect) const;
93+
virtual void setSoundEffectValue(Sound::Effect effect, double value);
9494

9595
virtual void clearSoundEffects();
9696

‎src/blocks/soundblocks.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,31 +356,31 @@ unsigned int SoundBlocks::stopAllSounds(VirtualMachine *vm)
356356
unsigned int SoundBlocks::setPitchEffectTo(VirtualMachine *vm)
357357
{
358358
if (Target *target = vm->target())
359-
target->setSoundEffect(Sound::Effect::Pitch, vm->getInput(0, 1)->toDouble());
359+
target->setSoundEffectValue(Sound::Effect::Pitch, vm->getInput(0, 1)->toDouble());
360360

361361
return 1;
362362
}
363363

364364
unsigned int SoundBlocks::setPanEffectTo(VirtualMachine *vm)
365365
{
366366
if (Target *target = vm->target())
367-
target->setSoundEffect(Sound::Effect::Pan, vm->getInput(0, 1)->toDouble());
367+
target->setSoundEffectValue(Sound::Effect::Pan, vm->getInput(0, 1)->toDouble());
368368

369369
return 1;
370370
}
371371

372372
unsigned int SoundBlocks::changePitchEffectBy(VirtualMachine *vm)
373373
{
374374
if (Target *target = vm->target())
375-
target->setSoundEffect(Sound::Effect::Pitch, target->soundEffect(Sound::Effect::Pitch) + vm->getInput(0, 1)->toDouble());
375+
target->setSoundEffectValue(Sound::Effect::Pitch, target->soundEffectValue(Sound::Effect::Pitch) + vm->getInput(0, 1)->toDouble());
376376

377377
return 1;
378378
}
379379

380380
unsigned int SoundBlocks::changePanEffectBy(VirtualMachine *vm)
381381
{
382382
if (Target *target = vm->target())
383-
target->setSoundEffect(Sound::Effect::Pan, target->soundEffect(Sound::Effect::Pan) + vm->getInput(0, 1)->toDouble());
383+
target->setSoundEffectValue(Sound::Effect::Pan, target->soundEffectValue(Sound::Effect::Pan) + vm->getInput(0, 1)->toDouble());
384384

385385
return 1;
386386
}

‎src/scratch/target.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ void Target::setVolume(double newVolume)
423423
}
424424

425425
/*! Returns the value of the given sound effect. */
426-
double Target::soundEffect(Sound::Effect effect) const
426+
double Target::soundEffectValue(Sound::Effect effect) const
427427
{
428428
auto it = impl->soundEffects.find(effect);
429429

@@ -434,7 +434,7 @@ double Target::soundEffect(Sound::Effect effect) const
434434
}
435435

436436
/*! Sets the value of the given sound effect. */
437-
void Target::setSoundEffect(Sound::Effect effect, double value)
437+
void Target::setSoundEffectValue(Sound::Effect effect, double value)
438438
{
439439
impl->soundEffects[effect] = value;
440440

@@ -450,7 +450,7 @@ void Target::clearSoundEffects()
450450
std::unordered_map<Sound::Effect, double> effects = impl->soundEffects; // must copy!
451451

452452
for (const auto &[effect, value] : effects)
453-
setSoundEffect(effect, 0);
453+
setSoundEffectValue(effect, 0);
454454

455455
impl->soundEffects.clear();
456456
}

‎test/blocks/sound_blocks_test.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -644,12 +644,12 @@ TEST_F(SoundBlocksTest, SetEffectToImpl)
644644
vm.setFunctions(functions);
645645
vm.setConstValues(constValues);
646646

647-
EXPECT_CALL(target, setSoundEffect(Sound::Effect::Pitch, -20.7));
647+
EXPECT_CALL(target, setSoundEffectValue(Sound::Effect::Pitch, -20.7));
648648
vm.run();
649649

650650
ASSERT_EQ(vm.registerCount(), 0);
651651

652-
EXPECT_CALL(target, setSoundEffect(Sound::Effect::Pan, 12.53));
652+
EXPECT_CALL(target, setSoundEffectValue(Sound::Effect::Pan, 12.53));
653653
vm.reset();
654654
vm.setBytecode(bytecode2);
655655
vm.run();
@@ -701,14 +701,14 @@ TEST_F(SoundBlocksTest, ChangeEffectByImpl)
701701
vm.setFunctions(functions);
702702
vm.setConstValues(constValues);
703703

704-
EXPECT_CALL(target, soundEffect(Sound::Effect::Pitch)).WillOnce(Return(56));
705-
EXPECT_CALL(target, setSoundEffect(Sound::Effect::Pitch, 35.3));
704+
EXPECT_CALL(target, soundEffectValue(Sound::Effect::Pitch)).WillOnce(Return(56));
705+
EXPECT_CALL(target, setSoundEffectValue(Sound::Effect::Pitch, 35.3));
706706
vm.run();
707707

708708
ASSERT_EQ(vm.registerCount(), 0);
709709

710-
EXPECT_CALL(target, soundEffect(Sound::Effect::Pan)).WillOnce(Return(-2.5));
711-
EXPECT_CALL(target, setSoundEffect(Sound::Effect::Pan, 10.03));
710+
EXPECT_CALL(target, soundEffectValue(Sound::Effect::Pan)).WillOnce(Return(-2.5));
711+
EXPECT_CALL(target, setSoundEffectValue(Sound::Effect::Pan, 10.03));
712712
vm.reset();
713713
vm.setBytecode(bytecode2);
714714
vm.run();

‎test/mocks/targetmock.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class TargetMock : public Target
1717

1818
MOCK_METHOD(void, setLayerOrder, (int), (override));
1919

20-
MOCK_METHOD(double, soundEffect, (Sound::Effect), (const, override));
21-
MOCK_METHOD(void, setSoundEffect, (Sound::Effect, double), (override));
20+
MOCK_METHOD(double, soundEffectValue, (Sound::Effect), (const, override));
21+
MOCK_METHOD(void, setSoundEffectValue, (Sound::Effect, double), (override));
2222

2323
MOCK_METHOD(void, clearSoundEffects, (), (override));
2424

‎test/scratch_classes/target_test.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@ TEST(TargetTest, Volume)
515515
TEST(TargetTest, SoundEffects)
516516
{
517517
Target target;
518-
ASSERT_EQ(target.soundEffect(Sound::Effect::Pitch), 0);
519-
ASSERT_EQ(target.soundEffect(Sound::Effect::Pan), 0);
518+
ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pitch), 0);
519+
ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pan), 0);
520520

521521
auto s1 = std::make_shared<SoundMock>();
522522
auto s2 = std::make_shared<SoundMock>();
@@ -532,16 +532,16 @@ TEST(TargetTest, SoundEffects)
532532
EXPECT_CALL(*s1, setEffect(Sound::Effect::Pitch, 12.5));
533533
EXPECT_CALL(*s2, setEffect(Sound::Effect::Pitch, 12.5));
534534
EXPECT_CALL(*s3, setEffect(Sound::Effect::Pitch, 12.5));
535-
target.setSoundEffect(Sound::Effect::Pitch, 12.5);
536-
ASSERT_EQ(target.soundEffect(Sound::Effect::Pitch), 12.5);
537-
ASSERT_EQ(target.soundEffect(Sound::Effect::Pan), 0);
535+
target.setSoundEffectValue(Sound::Effect::Pitch, 12.5);
536+
ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pitch), 12.5);
537+
ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pan), 0);
538538

539539
EXPECT_CALL(*s1, setEffect(Sound::Effect::Pan, -56.7));
540540
EXPECT_CALL(*s2, setEffect(Sound::Effect::Pan, -56.7));
541541
EXPECT_CALL(*s3, setEffect(Sound::Effect::Pan, -56.7));
542-
target.setSoundEffect(Sound::Effect::Pan, -56.7);
543-
ASSERT_EQ(target.soundEffect(Sound::Effect::Pitch), 12.5);
544-
ASSERT_EQ(target.soundEffect(Sound::Effect::Pan), -56.7);
542+
target.setSoundEffectValue(Sound::Effect::Pan, -56.7);
543+
ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pitch), 12.5);
544+
ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pan), -56.7);
545545

546546
auto s4 = std::make_shared<SoundMock>();
547547
EXPECT_CALL(*s4, setVolume);
@@ -558,8 +558,8 @@ TEST(TargetTest, SoundEffects)
558558
EXPECT_CALL(*s4, setEffect(Sound::Effect::Pitch, 0));
559559
EXPECT_CALL(*s4, setEffect(Sound::Effect::Pan, 0));
560560
target.clearSoundEffects();
561-
ASSERT_EQ(target.soundEffect(Sound::Effect::Pitch), 0);
562-
ASSERT_EQ(target.soundEffect(Sound::Effect::Pan), 0);
561+
ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pitch), 0);
562+
ASSERT_EQ(target.soundEffectValue(Sound::Effect::Pan), 0);
563563
}
564564

565565
TEST(TargetTest, CurrentCostumeWidth)

0 commit comments

Comments
 (0)