X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cd_shared.c;h=5d093e73292a0b86f258dd7419c5b576d36900ed;hp=998f76f4667de97fc4abfd954693c63a3a80450e;hb=1a7d8abc3f25b6c33757358a6e467a8683e2a6b0;hpb=3b7db4cb67e7468650e039c7ea8dac854e4deae6

diff --git a/cd_shared.c b/cd_shared.c
index 998f76f4..5d093e73 100644
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -21,6 +21,10 @@ 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
 
 // Prototypes of the system dependent functions
 extern void CDAudio_SysEject (void);
@@ -44,7 +48,7 @@ static qboolean wasPlaying = false;
 static qboolean initialized = false;
 static qboolean enabled = false;
 static float cdvolume;
-static qbyte remap[100];
+static qbyte remap[MAXTRACKS];
 static qbyte maxTrack;
 static int faketrack = -1;
 
@@ -95,30 +99,35 @@ void CDAudio_Play (qbyte 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);
+	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);
 		if (faketrack != -1)
 		{
 			if (looping)
-				S_LoopChannel (faketrack, true);
-			Con_DPrintf ("Fake CD track %u playing...\n", track);
+				S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true);
+			S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true);
+			Con_Printf ("Fake CD track %u playing...\n", track);
 		}
 	}
 
@@ -177,7 +186,7 @@ void CDAudio_Pause (void)
 		return;
 
 	if (faketrack != -1)
-		S_PauseChannel (faketrack, true);
+		S_SetChannelFlag (faketrack, CHANNELFLAG_PAUSED, true);
 	else if (CDAudio_SysPause() == -1)
 		return;
 
@@ -192,7 +201,7 @@ void CDAudio_Resume (void)
 		return;
 
 	if (faketrack != -1)
-		S_PauseChannel (faketrack, false);
+		S_SetChannelFlag (faketrack, CHANNELFLAG_PAUSED, false);
 	else if (CDAudio_SysResume() == -1)
 		return;
 	cdPlaying = true;
@@ -204,6 +213,8 @@ static void CD_f (void)
 	int ret;
 	int n;
 
+	Host_StartVideo();
+
 	if (Cmd_Argc() < 2)
 		return;
 
@@ -228,7 +239,7 @@ static void CD_f (void)
 		enabled = true;
 		if (cdPlaying)
 			CDAudio_Stop();
-		for (n = 0; n < 100; n++)
+		for (n = 0; n < MAXTRACKS; n++)
 			remap[n] = n;
 		CDAudio_GetAudioDiskInfo();
 		return;
@@ -239,7 +250,7 @@ static void CD_f (void)
 		ret = Cmd_Argc() - 2;
 		if (ret <= 0)
 		{
-			for (n = 1; n < 100; n++)
+			for (n = 1; n < MAXTRACKS; n++)
 				if (remap[n] != n)
 					Con_Printf("  %u -> %u\n", n, remap[n]);
 			return;
@@ -357,7 +368,7 @@ int CDAudio_Init (void)
 
 	CDAudio_SysInit();
 
-	for (i = 0; i < 100; i++)
+	for (i = 0; i < MAXTRACKS; i++)
 		remap[i] = i;
 
 	Cvar_RegisterVariable(&cdaudioinitialized);
@@ -375,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;
 }