From ca48ebcb6e22b17e217afc8661c572f83827b83d Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Wed, 3 Feb 2021 23:03:00 +0300
Subject: [PATCH] MP3 player fixes

---
 src/audio/sampman_oal.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 2091fb05..ae4b1cbb 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -1908,6 +1908,9 @@ cSampleManager::StopStreamedFile(uint8 nStream)
 	{
 		delete stream;
 		aStream[nStream] = NULL;
+
+		if ( nStream == 0 )
+			_bIsMp3Active = false;
 	}
 }
 
@@ -1920,7 +1923,21 @@ cSampleManager::GetStreamedFilePosition(uint8 nStream)
 	
 	if ( stream )
 	{
-		return stream->GetPosMS();
+		if ( _bIsMp3Active )
+		{
+			tMP3Entry *mp3 = _GetMP3EntryByIndex(_CurMP3Index);
+			
+			if ( mp3 != NULL )
+			{
+				return stream->GetPosMS() + mp3->nTrackStreamPos;
+			}
+			else
+				return 0;
+		}
+		else
+		{
+			return stream->GetPosMS();
+		}
 	}
 	
 	return 0;