Add cloning methods to AudioPlayer

Author: adazem009

src/audio/iaudioplayer.h

@@ -11,8 +11,13 @@ class IAudioPlayer
         virtual ~IAudioPlayer() { }
 
         virtual bool load(unsigned int size, const void *data, unsigned long sampleRate) = 0;
+        virtual bool loadCopy(IAudioPlayer *player) = 0;
+
+        virtual float volume() const = 0;
         virtual void setVolume(float volume) = 0;
 
+        virtual bool isLoaded() const = 0;
+
         virtual void start() = 0;
         virtual void stop() = 0;
 

src/audio/internal/audioplayer.cpp

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <iostream>
+#include <cassert>
 
 #include "audioplayer.h"
 #include "audioengine.h"
@@ -26,7 +27,7 @@ AudioPlayer::~AudioPlayer()
 
 bool AudioPlayer::load(unsigned int size, const void *data, unsigned long sampleRate)
 {
-    if (!AudioEngine::initialized())
+    if (!AudioEngine::initialized() || m_loaded)
         return false;
 
     ma_engine *engine = AudioEngine::engine();
@@ -55,6 +56,33 @@ bool AudioPlayer::load(unsigned int size, const void *data, unsigned long sample
     return true;
 }
 
+bool AudioPlayer::loadCopy(IAudioPlayer *player)
+{
+    assert(player && dynamic_cast<AudioPlayer *>(player));
+
+    if (!AudioEngine::initialized() || !player)
+        return false;
+
+    ma_engine *engine = AudioEngine::engine();
+
+    AudioPlayer *playerPtr = static_cast<AudioPlayer *>(player);
+    ma_result initResult = ma_sound_init_from_data_source(engine, playerPtr->m_decoder, MA_SOUND_FLAG_DECODE, NULL, m_sound);
+
+    if (initResult != MA_SUCCESS) {
+        std::cerr << "Failed to init sound copy." << std::endl;
+        return false;
+    }
+
+    m_loaded = true;
+    ma_sound_set_volume(m_sound, m_volume);
+    return true;
+}
+
+float AudioPlayer::volume() const
+{
+    return m_volume;
+}
+
 void AudioPlayer::setVolume(float volume)
 {
     m_volume = volume;
@@ -65,6 +93,11 @@ void AudioPlayer::setVolume(float volume)
     ma_sound_set_volume(m_sound, volume);
 }
 
+bool AudioPlayer::isLoaded() const
+{
+    return m_loaded;
+}
+
 void AudioPlayer::start()
 {
     if (!m_loaded)

src/audio/internal/audioplayer.h

@@ -17,8 +17,13 @@ class AudioPlayer : public IAudioPlayer
         ~AudioPlayer();
 
         bool load(unsigned int size, const void *data, unsigned long sampleRate) override;
+        bool loadCopy(IAudioPlayer *player) override;
+
+        float volume() const override;
         void setVolume(float volume) override;
 
+        bool isLoaded() const override;
+
         void start() override;
         void stop() override;
 

src/audio/internal/audioplayerstub.cpp

@@ -13,8 +13,24 @@ bool AudioPlayerStub::load(unsigned int size, const void *data, unsigned long sa
     return true;
 }
 
+bool AudioPlayerStub::loadCopy(IAudioPlayer *player)
+{
+    return true;
+}
+
+float AudioPlayerStub::volume() const
+{
+    return m_volume;
+}
+
 void AudioPlayerStub::setVolume(float volume)
 {
+    m_volume = volume;
+}
+
+bool AudioPlayerStub::isLoaded() const
+{
+    return true;
 }
 
 void AudioPlayerStub::start()

src/audio/internal/audioplayerstub.h

@@ -13,12 +13,20 @@ class AudioPlayerStub : public IAudioPlayer
         AudioPlayerStub();
 
         bool load(unsigned int size, const void *data, unsigned long sampleRate) override;
+        bool loadCopy(IAudioPlayer *player) override;
+
+        float volume() const override;
         void setVolume(float volume) override;
 
+        bool isLoaded() const override;
+
         void start() override;
         void stop() override;
 
         bool isPlaying() const override;
+
+    private:
+        float m_volume = 1;
 };
 
 } // namespace libscratchcpp

test/audio/CMakeLists.txt

@@ -33,3 +33,20 @@ gtest_discover_tests(audioinput_test)
 if (LIBSCRATCHCPP_AUDIO_SUPPORT)
     target_compile_definitions(audioinput_test PRIVATE LIBSCRATCHCPP_AUDIO_SUPPORT)
 endif()
+
+if(LIBSCRATCHCPP_AUDIO_SUPPORT)
+    # audioplayer_test
+    add_executable(
+      audioplayer_test
+      audioplayer_test.cpp
+    )
+
+    target_link_libraries(
+      audioplayer_test
+      GTest::gtest_main
+      scratchcpp
+    )
+
+    gtest_discover_tests(audioplayer_test)
+    target_compile_definitions(audioplayer_test PRIVATE LIBSCRATCHCPP_AUDIO_SUPPORT)
+endif()

test/audio/audioplayer_test.cpp

@@ -0,0 +1,14 @@
+#include <audio/internal/audioplayer.h>
+
+#include "../common.h"
+
+using namespace libscratchcpp;
+
+TEST(AudioPlayerTest, Volume)
+{
+    AudioPlayer player;
+    ASSERT_EQ(player.volume(), 1);
+
+    player.setVolume(0.86f);
+    ASSERT_EQ(player.volume(), 0.86f);
+}

test/mocks/audioplayermock.h

@@ -9,8 +9,13 @@ class AudioPlayerMock : public IAudioPlayer
 {
     public:
         MOCK_METHOD(bool, load, (unsigned int, const void *, unsigned long), (override));
+        MOCK_METHOD(bool, loadCopy, (IAudioPlayer *), (override));
+
+        MOCK_METHOD(float, volume, (), (const, override));
         MOCK_METHOD(void, setVolume, (float), (override));
 
+        MOCK_METHOD(bool, isLoaded, (), (const, override));
+
         MOCK_METHOD(void, start, (), (override));
         MOCK_METHOD(void, stop, (), (override));