X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cd_shared.c;h=33a5dcc627a52bcede4369fc0791fde6f3e3d161;hb=484246eea9f6b28b015a4772fca0ba1c6207a719;hp=5422d074563602f074c6566b38853cd5912001db;hpb=d6d983ac96b91fde4bdbfa41fc83f2eee1eec615;p=xonotic%2Fdarkplaces.git

diff --git a/cd_shared.c b/cd_shared.c
index 5422d074..33a5dcc6 100644
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "cdaudio.h"
 #include "sound.h"
 
-#define MAXTRACKS	256
-
 // Prototypes of the system dependent functions
 extern void CDAudio_SysEject (void);
 extern void CDAudio_SysCloseDoor (void);
@@ -50,7 +48,9 @@ static qboolean initialized = false;
 static qboolean enabled = false;
 static float cdvolume;
 typedef char filename_t[MAX_QPATH];
+#ifdef MAXTRACKS
 static filename_t remap[MAXTRACKS];
+#endif
 static unsigned char maxTrack;
 static int faketrack = -1;
 
@@ -121,7 +121,7 @@ qboolean CDAudio_Play_real (int track, qboolean looping, qboolean complain)
 		if (!cdValid)
 		{
 			if(complain)
-				Con_Print ("No CD in player.\n");
+				Con_DPrint ("No CD in player.\n");
 			return false;
 		}
 	}
@@ -129,15 +129,15 @@ qboolean CDAudio_Play_real (int track, qboolean looping, qboolean complain)
 	if (track > maxTrack)
 	{
 		if(complain)
-			Con_Printf("CDAudio: Bad track number %u.\n", track);
+			Con_DPrintf("CDAudio: Bad track number %u.\n", track);
 		return false;
 	}
 
 	if (CDAudio_SysPlay(track) == -1)
 		return false;
 
-	if(cdaudio.integer != 3 || developer.integer)
-		Con_Printf ("CD track %u playing...\n", track);
+	if(cdaudio.integer != 3)
+		Con_DPrintf ("CD track %u playing...\n", track);
 
 	return true;
 }
@@ -156,6 +156,7 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping)
 	if(strspn(trackname, "0123456789") == strlen(trackname))
 	{
 		track = (unsigned char) atoi(trackname);
+#ifdef MAXTRACKS
 		if(track > 0 && track < MAXTRACKS)
 			if(*remap[track])
 			{
@@ -183,6 +184,7 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping)
 					}
 				}
 			}
+#endif
 	}
 
 	if(strspn(trackname, "0123456789") == strlen(trackname))
@@ -190,7 +192,7 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping)
 		track = (unsigned char) atoi(trackname);
 		if (track < 1)
 		{
-			Con_Printf("CDAudio: Bad track number %u.\n", track);
+			Con_DPrintf("CDAudio: Bad track number %u.\n", track);
 			return;
 		}
 	}
@@ -231,7 +233,7 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping)
 		}
 		else
 		{
-			Con_Print ("No CD in player.\n");
+			Con_DPrint ("No CD in player.\n");
 		}
 		return;
 	}
@@ -267,8 +269,8 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping)
 			S_SetChannelFlag (faketrack, CHANNELFLAG_LOCALSOUND, true); // not pausable
 			if(track >= 1)
 			{
-				if(cdaudio.integer != 0 || developer.integer) // we don't need these messages if only fake tracks can be played anyway
-					Con_Printf ("Fake CD track %u playing...\n", track);
+				if(cdaudio.integer != 0) // we don't need these messages if only fake tracks can be played anyway
+					Con_DPrintf ("Fake CD track %u playing...\n", track);
 			}
 			else
 				Con_DPrintf ("BGM track %s playing...\n", trackname);
@@ -306,7 +308,7 @@ void CDAudio_Play (int track, qboolean looping)
 	CDAudio_Play_byName(buf, looping);
 }
 
-float CDAudio_GetPosition ()
+float CDAudio_GetPosition (void)
 {
 	if(faketrack != -1)
 		return S_GetChannelPosition(faketrack);
@@ -366,8 +368,10 @@ void CDAudio_Resume (void)
 static void CD_f (void)
 {
 	const char *command;
+#ifdef MAXTRACKS
 	int ret;
 	int n;
+#endif
 
 	command = Cmd_Argv (1);
 
@@ -391,8 +395,10 @@ static void CD_f (void)
 	{
 		enabled = true;
 		CDAudio_Stop();
+#ifdef MAXTRACKS
 		for (n = 0; n < MAXTRACKS; n++)
 			*remap[n] = 0; // empty string, that is, unremapped
+#endif
 		CDAudio_GetAudioDiskInfo();
 		return;
 	}
@@ -406,6 +412,7 @@ static void CD_f (void)
 
 	if (strcasecmp(command, "remap") == 0)
 	{
+#ifdef MAXTRACKS
 		ret = Cmd_Argc() - 2;
 		if (ret <= 0)
 		{
@@ -416,6 +423,7 @@ static void CD_f (void)
 		}
 		for (n = 1; n <= ret; n++)
 			strlcpy(remap[n], Cmd_Argv (n+1), sizeof(*remap));
+#endif
 		return;
 	}
 
@@ -535,7 +543,9 @@ void CDAudio_Update (void)
 
 int CDAudio_Init (void)
 {
+#ifdef MAXTRACKS
 	int i;
+#endif
 
 	if (cls.state == ca_dedicated)
 		return -1;
@@ -546,8 +556,10 @@ int CDAudio_Init (void)
 
 	CDAudio_SysInit();
 
+#ifdef MAXTRACKS
 	for (i = 0; i < MAXTRACKS; i++)
 		*remap[i] = 0;
+#endif
 
 	Cvar_RegisterVariable(&cdaudio);
 	Cvar_RegisterVariable(&cdaudioinitialized);