X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cd_shared.c;h=4923ebbef4ddeb2f062442d88589cbdc509e3eaa;hb=2d14ce5d11b815464cbf4229b8211a57f86be9d6;hp=bd2727f8bea72206d513558177c3c55e31f2807d;hpb=18d000a5376aa1257c1ac598a2a8031e9d74045f;p=xonotic%2Fdarkplaces.git

diff --git a/cd_shared.c b/cd_shared.c
index bd2727f8..4923ebbe 100644
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -26,6 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 extern void CDAudio_SysEject (void);
 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_SysStop (void);
 extern int CDAudio_SysPause (void);
@@ -44,6 +46,9 @@ static qboolean enabled = false;
 static float cdvolume;
 static qbyte remap[100];
 static qbyte maxTrack;
+static int faketrack = -1;
+
+static float saved_vol = 1.0f;
 
 // exported variables
 qboolean cdValid = false;
@@ -88,18 +93,13 @@ static int CDAudio_GetAudioDiskInfo (void)
 
 void CDAudio_Play (qbyte track, qboolean looping)
 {
+	sfx_t* sfx;
+
 	if (!enabled)
 		return;
 
-	if (!cdValid)
-	{
-		CDAudio_GetAudioDiskInfo();
-		if (!cdValid)
-			return;
-	}
-
 	track = remap[track];
-	if (track < 1 || track > maxTrack)
+	if (track < 1)
 	{
 		Con_DPrintf("CDAudio: Bad track number %u.\n", track);
 		return;
@@ -107,9 +107,43 @@ void CDAudio_Play (qbyte track, qboolean looping)
 
 	if (cdPlaying && cdPlayTrack == track)
 		return;
+	CDAudio_Stop ();
 
-	if (CDAudio_SysPlay(track) == -1)
-		return;
+	// Try playing a fake track (sound file) first
+	sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false, true);
+	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);
+		}
+	}
+
+	// If we can't play a fake CD track, try the real one
+	if (faketrack == -1)
+	{
+		if (!cdValid)
+		{
+			CDAudio_GetAudioDiskInfo();
+			if (!cdValid)
+			{
+				Con_Print ("No CD in player.\n");
+				return;
+			}
+		}
+
+		if (track > maxTrack)
+		{
+			Con_Printf("CDAudio: Bad track number %u.\n", track);
+			return;
+		}
+
+		if (CDAudio_SysPlay(track) == -1)
+			return;
+	}
 
 	cdPlayLooping = looping;
 	cdPlayTrack = track;
@@ -125,7 +159,12 @@ void CDAudio_Stop (void)
 	if (!enabled || !cdPlaying)
 		return;
 
-	if (CDAudio_SysStop() == -1)
+	if (faketrack != -1)
+	{
+		S_StopChannel (faketrack);
+		faketrack = -1;
+	}
+	else if (CDAudio_SysStop() == -1)
 		return;
 
 	wasPlaying = false;
@@ -137,7 +176,9 @@ void CDAudio_Pause (void)
 	if (!enabled || !cdPlaying)
 		return;
 
-	if (CDAudio_SysPause() == -1)
+	if (faketrack != -1)
+		S_PauseChannel (faketrack, true);
+	else if (CDAudio_SysPause() == -1)
 		return;
 
 	wasPlaying = cdPlaying;
@@ -147,10 +188,12 @@ void CDAudio_Pause (void)
 
 void CDAudio_Resume (void)
 {
-	if (!enabled || !cdValid || !wasPlaying)
+	if (!enabled || cdPlaying || !wasPlaying)
 		return;
 
-	if (CDAudio_SysResume() == -1)
+	if (faketrack != -1)
+		S_PauseChannel (faketrack, false);
+	else if (CDAudio_SysResume() == -1)
 		return;
 	cdPlaying = true;
 }
@@ -212,16 +255,6 @@ static void CD_f (void)
 		return;
 	}
 
-	if (!cdValid)
-	{
-		CDAudio_GetAudioDiskInfo();
-		if (!cdValid)
-		{
-			Con_Printf("No CD in player.\n");
-			return;
-		}
-	}
-
 	if (strcasecmp(command, "play") == 0)
 	{
 		CDAudio_Play((qbyte)atoi(Cmd_Argv (2)), false);
@@ -254,7 +287,7 @@ static void CD_f (void)
 
 	if (strcasecmp(command, "eject") == 0)
 	{
-		if (cdPlaying)
+		if (cdPlaying && faketrack == -1)
 			CDAudio_Stop();
 		CDAudio_Eject();
 		cdValid = false;
@@ -263,7 +296,11 @@ static void CD_f (void)
 
 	if (strcasecmp(command, "info") == 0)
 	{
-		Con_Printf("%u tracks\n", maxTrack);
+		CDAudio_GetAudioDiskInfo ();
+		if (cdValid)
+			Con_Printf("%u tracks on CD.\n", maxTrack);
+		else
+			Con_Print ("No CD in player.\n");
 		if (cdPlaying)
 			Con_Printf("Currently %s track %u\n", cdPlayLooping ? "looping" : "playing", cdPlayTrack);
 		else if (wasPlaying)
@@ -273,28 +310,38 @@ static void CD_f (void)
 	}
 }
 
-void CDAudio_Update (void)
+void CDAudio_SetVolume (float newvol)
 {
-	if (!enabled)
+	// If the volume hasn't changed
+	if (newvol == cdvolume)
 		return;
 
-	if (bgmvolume.value != cdvolume)
+	// If the CD has been muted
+	if (newvol == 0.0f)
+		CDAudio_Pause ();
+	else
 	{
-		if (cdvolume)
-		{
-			Cvar_SetValueQuick (&bgmvolume, 0.0);
-			cdvolume = bgmvolume.value;
-			CDAudio_Pause ();
-		}
-		else
-		{
-			Cvar_SetValueQuick (&bgmvolume, 1.0);
-			cdvolume = bgmvolume.value;
+		// If the CD has been unmuted
+		if (cdvolume == 0.0f)
 			CDAudio_Resume ();
-		}
+
+		if (faketrack != -1)
+			S_SetChannelVolume (faketrack, newvol);
+		CDAudio_SysSetVolume (newvol);
 	}
 
-	CDAudio_SysUpdate();
+	cdvolume = newvol;
+}
+
+void CDAudio_Update (void)
+{
+	if (!enabled)
+		return;
+
+	CDAudio_SetVolume (bgmvolume.value);
+
+	if (faketrack == -1)
+		CDAudio_SysUpdate();
 }
 
 int CDAudio_Init (void)
@@ -323,18 +370,26 @@ int CDAudio_Init (void)
 
 int CDAudio_Startup (void)
 {
-	if (CDAudio_SysStartup() == -1)
-		return -1;
+	CDAudio_SysStartup ();
 
 	if (CDAudio_GetAudioDiskInfo())
 	{
-		Con_DPrintf("CDAudio_Init: No CD in player.\n");
+		Con_DPrint("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");
+		saved_vol = 1.0f;
+	}
+	else
+		Con_DPrintf ("Initial CD volume: %g\n", saved_vol);
+
 	initialized = true;
 
-	Con_DPrintf("CD Audio Initialized\n");
+	Con_DPrint("CD Audio Initialized\n");
 
 	return 0;
 }
@@ -343,6 +398,9 @@ void CDAudio_Shutdown (void)
 {
 	if (!initialized)
 		return;
+
+	CDAudio_SysSetVolume (saved_vol);
+
 	CDAudio_Stop();
 	CDAudio_SysShutdown();
 	initialized = false;