From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 19 Oct 2018 07:02:35 +0000 (+0000)
Subject: Make CDAudio_Play_byName static.
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=2e9fe4d8070a563ff28a23a76285bad0e795f559

Make CDAudio_Play_byName static.

It isn't called by any other compilation units, but only internally by
other cd_shared.c functions; more importantly, it does not check for
music_playlist being active like CDAudio_Play does, which would at the
very least be confusing if someone were to add a string version of
qw_svc_cdtrack (WHY WOULD ONE).

Thus: no functional change here.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12467 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cd_shared.c b/cd_shared.c
index eb78eaf1..e8634065 100644
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -116,7 +116,10 @@ static int CDAudio_GetAudioDiskInfo (void)
 	return -1;
 }
 
-void CDAudio_Play_byName (const char *trackname, qboolean looping, qboolean tryreal, float startposition)
+// Helper for CDAudio_Play, the "cd" command, and the music_playlist system.
+// Does _not_ act as NOP when a playlist is active, simply because this is used
+// _by_ playlist code. So beware when calling this.
+static void CDAudio_Play_byName (const char *trackname, qboolean looping, qboolean tryreal, float startposition)
 {
 	unsigned int track;
 	sfx_t* sfx;
diff --git a/cdaudio.h b/cdaudio.h
index 3fed67fa..1e533834 100644
--- a/cdaudio.h
+++ b/cdaudio.h
@@ -40,7 +40,6 @@ int CDAudio_Init(void);
 void CDAudio_Open(void);
 void CDAudio_Close(void);
 void CDAudio_Play(int track, qboolean looping);
-void CDAudio_Play_byName (const char *trackname, qboolean looping, qboolean tryreal, float startposition);
 void CDAudio_Stop(void);
 void CDAudio_Pause(void);
 void CDAudio_Resume(void);