From 9c0c6c5cc1744936e5441d3506ee52ef9a30bab4 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Sun, 19 Apr 2020 08:29:58 +0000
Subject: [PATCH] Fix music not looping.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5674 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/m_mp3.c | 72 ++++++++++++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 28 deletions(-)

diff --git a/engine/client/m_mp3.c b/engine/client/m_mp3.c
index ef69bb5a5..b339999dc 100644
--- a/engine/client/m_mp3.c
+++ b/engine/client/m_mp3.c
@@ -169,6 +169,8 @@ static char media_loopingtrack[MAX_QPATH];	//name of track to loop afterwards
 qboolean media_fadeout;
 float media_fadeouttime;
 
+qboolean Media_CleanupTrackName(const char *track, int *out_track, char *result, size_t resultsize);
+
 //whatever music track was previously playing has terminated.
 //return value is the new sample to start playing.
 //*starttime says the time into the track that we should resume playing at
@@ -254,7 +256,10 @@ sfx_t *Media_NextTrack(int musicchannelnum, float *starttime)
 				*media_playtrack = 0;
 			}
 			else
-				Q_strncpyz(media_currenttrack, media_loopingtrack, sizeof(media_currenttrack));
+			{
+				if (!Media_CleanupTrackName(media_loopingtrack, NULL, media_currenttrack, sizeof(media_currenttrack)))
+					Q_strncpyz(media_currenttrack, "", sizeof(media_currenttrack));
+			}
 #ifdef HAVE_JUKEBOX
 			Q_strncpyz(media_friendlyname, "", sizeof(media_friendlyname));
 			media_playlistcurrent = MEDIA_GAMEMUSIC;
@@ -324,11 +329,8 @@ void Media_WriteCurrentTrack(sizebuf_t *buf)
 	MSG_WriteByte (buf, 0);
 }
 
-//controls which music track should be playing right now
-//track and looptrack will usually be the same thing, track is what to play NOW, looptrack is what to keep re-playing after, or "-" for stop.
-qboolean Media_NamedTrack(const char *track, const char *looptrack)
+qboolean Media_CleanupTrackName(const char *track, int *out_track, char *result, size_t resultsize)
 {
-	unsigned int tracknum;
 	//FIXME: for q2, gog uses ../music/Track%02i.ogg, with various remapping requirements for the mission packs.
 	static char *path[] =
 	{
@@ -352,26 +354,11 @@ qboolean Media_NamedTrack(const char *track, const char *looptrack)
 		".wav",
 		NULL
 	};
-	char trackname[MAX_QPATH];
-	char tryname[MAX_QPATH];
-	int bestdepth = 0x7fffffff, d;
-	int ie, ip;
+	unsigned int tracknum;
 	char *trackend;
-
-	if (!track && !looptrack)
-	{
-		*media_playtrack = *media_loopingtrack = 0;
-		Media_Changed(MEDIA_GAMEMUSIC);
-		return true;
-	}
-
-	if (!track || !*track)			//ignore calls if the primary track is invalid. whatever is already playing will continue to play.
-		return false;
-	if (!looptrack || !*looptrack)	//null or empty looptrack loops using the primary track, for compat with q3.
-		looptrack = track;
-
-	if (!strcmp(looptrack, "-"))	//- for the looptrack argument can be used to prevent looping.
-		looptrack = "";
+	unsigned int ip, ie;
+	int bestdepth = 0x7fffffff, d;
+	char tryname[MAX_QPATH];
 
 	//check if its a proper number (0123456789 without any other weird stuff. if so, we can use fake track paths or actual cd tracks)
 	tracknum = strtoul(track, &trackend, 10);
@@ -410,7 +397,7 @@ qboolean Media_NamedTrack(const char *track, const char *looptrack)
 						if (d < bestdepth)
 						{
 							bestdepth = d;
-							Q_strncpy(trackname, tryname, sizeof(trackname));
+							Q_strncpy(result, tryname, resultsize);
 						}
 					}
 				}
@@ -423,7 +410,7 @@ qboolean Media_NamedTrack(const char *track, const char *looptrack)
 						if (d < bestdepth)
 						{
 							bestdepth = d;
-							Q_strncpy(trackname, tryname, sizeof(trackname));
+							Q_strncpy(result, tryname, resultsize);
 						}
 					}
 				}
@@ -438,14 +425,43 @@ qboolean Media_NamedTrack(const char *track, const char *looptrack)
 				if (d < bestdepth)
 				{
 					bestdepth = d;
-					Q_strncpy(trackname, tryname, sizeof(trackname));
+					Q_strncpy(result, tryname, resultsize);
 				}
 			}
 		}
 	}
 
-	//okay, do that faketrack thing if we got one.
+	if (out_track)
+		*out_track = tracknum;
 	if (bestdepth < 0x7fffffff)
+		return true;
+	return false;
+}
+
+//controls which music track should be playing right now
+//track and looptrack will usually be the same thing, track is what to play NOW, looptrack is what to keep re-playing after, or "-" for stop.
+qboolean Media_NamedTrack(const char *track, const char *looptrack)
+{
+	unsigned int tracknum;
+	char trackname[MAX_QPATH];
+
+	if (!track && !looptrack)
+	{
+		*media_playtrack = *media_loopingtrack = 0;
+		Media_Changed(MEDIA_GAMEMUSIC);
+		return true;
+	}
+
+	if (!track || !*track)			//ignore calls if the primary track is invalid. whatever is already playing will continue to play.
+		return false;
+	if (!looptrack || !*looptrack)	//null or empty looptrack loops using the primary track, for compat with q3.
+		looptrack = track;
+
+	if (!strcmp(looptrack, "-"))	//- for the looptrack argument can be used to prevent looping.
+		looptrack = "";
+
+	//okay, do that faketrack thing if we got one.
+	if (Media_CleanupTrackName(track, &tracknum, trackname, sizeof(trackname)))
 	{
 #ifdef HAVE_CDPLAYER
 		cdplaytracknum = 0;