Merge pull request #510 from scratchcpp/audio_input_api

Add audio input API

Author: adazem009

src/audio/CMakeLists.txt

@@ -1,7 +1,7 @@
 option(LIBSCRATCHCPP_AUDIO_SUPPORT "Audio support" ON)
 
 add_library(scratchcpp-audio STATIC)
-set(MINIAUDIO_SRC thirdparty/miniaudio)
+set(MINIAUDIO_SRC internal/thirdparty/miniaudio)
 
 if (LIBSCRATCHCPP_AUDIO_SUPPORT)
     add_library(miniaudio STATIC
@@ -16,23 +16,31 @@ endif()
 target_sources(scratchcpp-audio
   PUBLIC
     iaudioplayer.h
-    iaudioplayerfactory.h
-    audioplayerfactory.cpp
-    audioplayerfactory.h
+    iaudiooutput.h
+    audiooutput.cpp
+    audiooutput.h
+    iaudioinput.h
+    audioinput.h
+    audioinput.cpp
+    iaudioloudness.h
 )
 
 if (LIBSCRATCHCPP_AUDIO_SUPPORT)
     target_sources(scratchcpp-audio
       PUBLIC
-        audioengine.cpp
-	audioengine.h
-	audioplayer.cpp
-	audioplayer.h
+        internal/audioengine.cpp
+        internal/audioengine.h
+        internal/audioplayer.cpp
+        internal/audioplayer.h
+        internal/audioloudness.cpp
+        internal/audioloudness.h
     )
 else()
     target_sources(scratchcpp-audio
       PUBLIC
-        audioplayerstub.cpp
-	audioplayerstub.h
+        internal/audioplayerstub.cpp
+        internal/audioplayerstub.h
+        internal/audioloudnessstub.cpp
+        internal/audioloudnessstub.h
     )
 endif()

src/audio/audioinput.cpp

@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+
+#include "audioinput.h"
+
+#ifdef LIBSCRATCHCPP_AUDIO_SUPPORT
+#include "internal/audioloudness.h"
+#else
+#include "internal/audioloudnessstub.h"
+#endif
+
+using namespace libscratchcpp;
+
+std::shared_ptr<IAudioInput> AudioInput::m_instance = std::make_shared<AudioInput>();
+
+AudioInput::AudioInput()
+{
+}
+
+std::shared_ptr<IAudioInput> AudioInput::instance()
+{
+    return m_instance;
+}
+
+std::shared_ptr<IAudioLoudness> AudioInput::audioLoudness() const
+{
+    if (!m_audioLoudness) {
+#ifdef LIBSCRATCHCPP_AUDIO_SUPPORT
+        m_audioLoudness = std::make_shared<AudioLoudness>();
+#else
+        m_audioLoudness = std::make_shared<AudioLoudnessStub>();
+#endif
+    }
+
+    return m_audioLoudness;
+}

src/audio/audioinput.h

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <memory>
+
+#include "iaudioinput.h"
+
+namespace libscratchcpp
+{
+
+class AudioInput : public IAudioInput
+{
+    public:
+        AudioInput();
+
+        static std::shared_ptr<IAudioInput> instance();
+
+        std::shared_ptr<IAudioLoudness> audioLoudness() const override;
+
+    private:
+        static std::shared_ptr<IAudioInput> m_instance;
+
+        mutable std::shared_ptr<IAudioLoudness> m_audioLoudness;
+};
+
+} // namespace libscratchcpp

src/audio/audiooutput.cpp

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+
+#include "audiooutput.h"
+
+#ifdef LIBSCRATCHCPP_AUDIO_SUPPORT
+#include "internal/audioplayer.h"
+#else
+#include "internal/audioplayerstub.h"
+#endif
+
+using namespace libscratchcpp;
+
+std::shared_ptr<IAudioOutput> AudioOutput::m_instance = std::make_shared<AudioOutput>();
+
+AudioOutput::AudioOutput()
+{
+}
+
+std::shared_ptr<IAudioOutput> AudioOutput::instance()
+{
+    return m_instance;
+}
+
+std::shared_ptr<IAudioPlayer> AudioOutput::createAudioPlayer() const
+{
+#ifdef LIBSCRATCHCPP_AUDIO_SUPPORT
+    return std::make_shared<AudioPlayer>();
+#else
+    return std::make_shared<AudioPlayerStub>();
+#endif
+}

src/audio/audiooutput.h

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include "iaudiooutput.h"
+
+namespace libscratchcpp
+{
+
+class AudioOutput : public IAudioOutput
+{
+    public:
+        AudioOutput();
+
+        static std::shared_ptr<IAudioOutput> instance();
+
+        std::shared_ptr<IAudioPlayer> createAudioPlayer() const override;
+
+    private:
+        static std::shared_ptr<IAudioOutput> m_instance;
+};
+
+} // namespace libscratchcpp

src/audio/audioplayerfactory.cpp

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <memory>
+
+namespace libscratchcpp
+{
+
+class IAudioLoudness;
+
+class IAudioInput
+{
+
+    public:
+        virtual ~IAudioInput() { }
+
+        virtual std::shared_ptr<IAudioLoudness> audioLoudness() const = 0;
+};
+
+} // namespace libscratchcpp

src/audio/audioplayerfactory.h

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+namespace libscratchcpp
+{
+
+class IAudioLoudness
+{
+    public:
+        virtual ~IAudioLoudness() { }
+
+        virtual int getLoudness() const = 0;
+};
+
+} // namespace libscratchcpp

src/audio/iaudioinput.h

@@ -9,12 +9,12 @@ namespace libscratchcpp
 
 class IAudioPlayer;
 
-class IAudioPlayerFactory
+class IAudioOutput
 {
     public:
-        virtual ~IAudioPlayerFactory() { }
+        virtual ~IAudioOutput() { }
 
-        virtual std::shared_ptr<IAudioPlayer> create() const = 0;
+        virtual std::shared_ptr<IAudioPlayer> createAudioPlayer() const = 0;
 };
 
 } // namespace libscratchcpp