X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cd_shared.c;h=a4cf1e82a7d3224bf2014f207654688cc0d9b167;hb=890d4c00928b263763b460cb6f5b6a828fd4afc7;hp=c0f0514c48cb9fa314af94dd33e5e2a2aa34142f;hpb=7c320ed3cd5e1738024b3cd3f1fc305940f88dce;p=xonotic%2Fdarkplaces.git

diff --git a/cd_shared.c b/cd_shared.c
index c0f0514c..a4cf1e82 100644
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // rights reserved.
 
 #include "quakedef.h"
+#include "cdaudio.h"
+#include "snd_main.h"
 
 #define MAXTRACKS	256
 
@@ -30,7 +32,7 @@ extern void CDAudio_SysCloseDoor (void);
 extern int CDAudio_SysGetAudioDiskInfo (void);
 extern float CDAudio_SysGetVolume (void);
 extern void CDAudio_SysSetVolume (float volume);
-extern int CDAudio_SysPlay (qbyte track);
+extern int CDAudio_SysPlay (unsigned char track);
 extern int CDAudio_SysStop (void);
 extern int CDAudio_SysPause (void);
 extern int CDAudio_SysResume (void);
@@ -46,8 +48,8 @@ static qboolean wasPlaying = false;
 static qboolean initialized = false;
 static qboolean enabled = false;
 static float cdvolume;
-static qbyte remap[MAXTRACKS];
-static qbyte maxTrack;
+static unsigned char remap[MAXTRACKS];
+static unsigned char maxTrack;
 static int faketrack = -1;
 
 static float saved_vol = 1.0f;
@@ -56,7 +58,7 @@ static float saved_vol = 1.0f;
 qboolean cdValid = false;
 qboolean cdPlaying = false;
 qboolean cdPlayLooping = false;
-qbyte cdPlayTrack;
+unsigned char cdPlayTrack;
 
 
 static void CDAudio_Eject (void)
@@ -93,29 +95,30 @@ static int CDAudio_GetAudioDiskInfo (void)
 }
 
 
-void CDAudio_Play (qbyte track, qboolean looping)
+void CDAudio_Play (unsigned char track, qboolean looping)
 {
 	sfx_t* sfx;
 
+	Host_StartVideo();
+
 	if (!enabled)
 		return;
 
 	track = remap[track];
 	if (track < 1)
 	{
-		Con_DPrintf("CDAudio: Bad track number %u.\n", track);
+		Con_Printf("CDAudio: Bad track number %u.\n", track);
 		return;
 	}
 
-	if (cdPlaying && cdPlayTrack == track)
+	if (cdPlaying && cdPlayTrack == track && faketrack == -1)
 		return;
 	CDAudio_Stop ();
 
 	// Try playing a fake track (sound file) first
-	sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false, true, false);
-	// FIXME: perhaps force it to be always %03u (but for compatibility?):
-	if (!sfx)
-		sfx = S_PrecacheSound (va ("cdtracks/track%03u.wav", track), false, true, false);
+	sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false, false);
+	if (sfx == NULL || sfx->fetcher == NULL)
+		sfx = S_PrecacheSound (va ("cdtracks/track%03u.wav", track), false, false);
 	if (sfx != NULL)
 	{
 		faketrack = S_StartSound (-1, 0, sfx, vec3_origin, cdvolume, 0);
@@ -124,7 +127,7 @@ void CDAudio_Play (qbyte track, qboolean looping)
 			if (looping)
 				S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true);
 			S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true);
-			Con_DPrintf ("Fake CD track %u playing...\n", track);
+			Con_Printf ("Fake CD track %u playing...\n", track);
 		}
 	}
 
@@ -210,6 +213,8 @@ static void CD_f (void)
 	int ret;
 	int n;
 
+	Host_StartVideo();
+
 	if (Cmd_Argc() < 2)
 		return;
 
@@ -263,13 +268,13 @@ static void CD_f (void)
 
 	if (strcasecmp(command, "play") == 0)
 	{
-		CDAudio_Play((qbyte)atoi(Cmd_Argv (2)), false);
+		CDAudio_Play((unsigned char)atoi(Cmd_Argv (2)), false);
 		return;
 	}
 
 	if (strcasecmp(command, "loop") == 0)
 	{
-		CDAudio_Play((qbyte)atoi(Cmd_Argv (2)), true);
+		CDAudio_Play((unsigned char)atoi(Cmd_Argv (2)), true);
 		return;
 	}
 
@@ -381,22 +386,22 @@ int CDAudio_Startup (void)
 
 	if (CDAudio_GetAudioDiskInfo())
 	{
-		Con_DPrint("CDAudio_Init: No CD in player.\n");
+		Con_Print("CDAudio_Init: No CD in player.\n");
 		cdValid = false;
 	}
 
 	saved_vol = CDAudio_SysGetVolume ();
 	if (saved_vol < 0.0f)
 	{
-		Con_DPrint ("Can't get initial CD volume\n");
+		Con_Print ("Can't get initial CD volume\n");
 		saved_vol = 1.0f;
 	}
 	else
-		Con_DPrintf ("Initial CD volume: %g\n", saved_vol);
+		Con_Printf ("Initial CD volume: %g\n", saved_vol);
 
 	initialized = true;
 
-	Con_DPrint("CD Audio Initialized\n");
+	Con_Print("CD Audio Initialized\n");
 
 	return 0;
 }