AudioPlayer: Ignore uninitialized sounds

Author: adazem009

src/audio/audioplayer.cpp

@@ -51,20 +51,23 @@ bool AudioPlayer::load(unsigned int size, const void *data, unsigned long sample
     }
 
     m_loaded = true;
+    ma_sound_set_volume(m_sound, m_volume);
     return true;
 }
 
 void AudioPlayer::setVolume(float volume)
 {
-    if (!AudioEngine::initialized())
+    m_volume = volume;
+
+    if (!m_loaded)
         return;
 
     ma_sound_set_volume(m_sound, volume);
 }
 
 void AudioPlayer::start()
 {
-    if (!AudioEngine::initialized())
+    if (!m_loaded)
         return;
 
     if (isPlaying())
@@ -88,7 +91,7 @@ void AudioPlayer::start()
 
 void AudioPlayer::stop()
 {
-    if (!AudioEngine::initialized())
+    if (!m_loaded)
         return;
 
     ma_result result = ma_sound_stop(m_sound);
@@ -100,7 +103,7 @@ void AudioPlayer::stop()
 
 bool AudioPlayer::isPlaying() const
 {
-    if (!AudioEngine::initialized())
+    if (!m_loaded)
         return false;
 
     return m_started && !m_sound->atEnd;

src/audio/audioplayer.h

@@ -29,6 +29,7 @@ class AudioPlayer : public IAudioPlayer
         ma_sound *m_sound;
         bool m_loaded = false;
         bool m_started = false;
+        float m_volume = 1;
 };
 
 } // namespace libscratchcpp