Engine: fixed SoundClip not updating position on PlayFrom() call

adventuregamestudio · Feb 25, 2025 · 5068a6a · 5068a6a
1 parent 6420630
commit 5068a6a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Engine/media/audio/audioplayer.cpp b/Engine/media/audio/audioplayer.cpp
@@ -33,6 +33,7 @@ void AudioPlayer::Init()
         success = _decoder->Seek(_onLoadPositionMs) == _onLoadPositionMs;
     else
         success = _decoder->Open(_onLoadPositionMs);
+    _source->SetPlaybackPosMs(_decoder->GetPositionMs());
     _playState = success ? _onLoadPlayState : PlayStateError;
     if (_playState == PlayStatePlaying)
         _source->Play();
@@ -123,6 +124,7 @@ void AudioPlayer::Seek(float pos_ms)
     {
     case PlayStateInitial:
         _onLoadPositionMs = pos_ms;
+        Init(); // make sure the decoder opens and seeks, update posMs
         break;
     case PlayStatePlaying:
     case PlayStatePaused:

diff --git a/Engine/media/audio/soundclip.cpp b/Engine/media/audio/soundclip.cpp
@@ -57,6 +57,12 @@ int SoundClip::play()
     return true;
 }
 
+int SoundClip::play_from(int position)
+{
+    seek(position);
+    return play();
+}
+
 void SoundClip::pause()
 {
     if (!is_ready())

diff --git a/Engine/media/audio/soundclip.h b/Engine/media/audio/soundclip.h
@@ -55,6 +55,7 @@ class SoundClip final
     int maximumPossibleDistanceAway;
 
     int  play();
+    int  play_from(int position);
     void pause();
     void resume();
     // Seeks to the position, where pos units depend on the audio type
@@ -68,12 +69,6 @@ class SoundClip final
     // Returns if the clip is still playing, otherwise it's finished
     bool update();
 
-    inline int play_from(int position)
-    {
-        seek(position);
-        return play();
-    }
-
     // Gets if the clip is valid (playing or ready to play)
     inline bool is_ready() const
     {