Use static variables for global instances of audio classes

Author: adazem009

src/audio/audioinput.cpp

@@ -10,15 +10,15 @@
 
 using namespace libscratchcpp;
 
-std::shared_ptr<IAudioInput> AudioInput::m_instance = std::make_shared<AudioInput>();
+static std::shared_ptr<IAudioInput> INSTANCE = std::make_shared<AudioInput>();
 
 AudioInput::AudioInput()
 {
 }
 
 std::shared_ptr<IAudioInput> AudioInput::instance()
 {
-    return m_instance;
+    return INSTANCE;
 }
 
 std::shared_ptr<IAudioLoudness> AudioInput::audioLoudness() const

src/audio/audioinput.h

@@ -19,8 +19,6 @@ class AudioInput : public IAudioInput
         std::shared_ptr<IAudioLoudness> audioLoudness() const override;
 
     private:
-        static std::shared_ptr<IAudioInput> m_instance;
-
         mutable std::shared_ptr<IAudioLoudness> m_audioLoudness;
 };
 

src/audio/audiooutput.cpp

@@ -10,15 +10,15 @@
 
 using namespace libscratchcpp;
 
-std::shared_ptr<IAudioOutput> AudioOutput::m_instance = std::make_shared<AudioOutput>();
+static std::shared_ptr<IAudioOutput> INSTANCE = std::make_shared<AudioOutput>();
 
 AudioOutput::AudioOutput()
 {
 }
 
 std::shared_ptr<IAudioOutput> AudioOutput::instance()
 {
-    return m_instance;
+    return INSTANCE;
 }
 
 std::shared_ptr<IAudioPlayer> AudioOutput::createAudioPlayer() const

src/audio/audiooutput.h

@@ -15,9 +15,6 @@ class AudioOutput : public IAudioOutput
         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/internal/audioengine.cpp

@@ -7,27 +7,27 @@
 
 using namespace libscratchcpp;
 
-AudioEngine AudioEngine::instance;
+static AudioEngine INSTANCE;
 
 IAudioEngine *IAudioEngine::instance()
 {
-    return &AudioEngine::instance;
+    return &INSTANCE;
 }
 
 ma_engine *AudioEngine::engine()
 {
-    if (!instance.m_initialized)
-        instance.init();
+    if (!INSTANCE.m_initialized)
+        INSTANCE.init();
 
-    return instance.m_initialized ? instance.m_engine : nullptr;
+    return INSTANCE.m_initialized ? INSTANCE.m_engine : nullptr;
 }
 
 bool AudioEngine::initialized()
 {
-    if (!instance.m_initialized)
-        instance.init();
+    if (!INSTANCE.m_initialized)
+        INSTANCE.init();
 
-    return instance.m_initialized;
+    return INSTANCE.m_initialized;
 }
 
 float AudioEngine::volume() const

src/audio/internal/audioengine.h

@@ -15,6 +15,9 @@ namespace libscratchcpp
 class AudioEngine : public IAudioEngine
 {
     public:
+        AudioEngine();
+        ~AudioEngine();
+
         friend class IAudioEngine;
 
         static ma_engine *engine();
@@ -24,13 +27,8 @@ class AudioEngine : public IAudioEngine
         void setVolume(float volume) override;
 
     private:
-        AudioEngine();
-        ~AudioEngine();
-
         void init();
 
-        static AudioEngine instance;
-
         ma_engine *m_engine = nullptr;
         bool m_initialized = false;
         float m_volume = 1.0f;