X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cd_linux.c;h=c502e0ace8d21d0135be85242c2d614fc524387e;hp=de4da156bc1175cf6eadcc7f4bb08696ab8e76c7;hb=c4ddb9412fdc65efb2e47807baedf7a25234f891;hpb=af0b7a1fa11c2ceedeb9f66ca950f6c0bff8ad8f

diff --git a/cd_linux.c b/cd_linux.c
index de4da156..c502e0ac 100644
--- a/cd_linux.c
+++ b/cd_linux.c
@@ -383,32 +383,37 @@ int CDAudio_Init(void)
 		cd_dev[sizeof(cd_dev) - 1] = 0;
 	}
 
-	if ((cdfile = open(cd_dev, O_RDONLY)) == -1) {
-		Con_DPrintf("CDAudio_Init: open of \"%s\" failed (%i)\n", cd_dev, errno);
-		cdfile = -1;
-		return -1;
-	}
+	Cmd_AddCommand("cd", CD_f);
 
 	for (i = 0; i < 100; i++)
 		remap[i] = i;
 	cdaudioinitialized = true;
-	initialized = true;
 	enabled = true;
 
+	return 0;
+}
+
+int CDAudio_Startup(void)
+{
+	if ((cdfile = open(cd_dev, O_RDONLY)) == -1) {
+		Con_DPrintf("CDAudio_Init: open of \"%s\" failed (%i)\n", cd_dev, errno);
+		cdfile = -1;
+		return -1;
+	}
+
 	if (CDAudio_GetAudioDiskInfo())
 	{
 		Con_DPrintf("CDAudio_Init: No CD in player.\n");
 		cdValid = false;
 	}
 
-	Cmd_AddCommand ("cd", CD_f);
+	initialized = true;
 
-	Con_DPrintf("CD Audio Initialized\n");
+	Con_DPrintf("CD Audio Started\n");
 
 	return 0;
 }
 
-
 void CDAudio_Shutdown(void)
 {
 	if (!initialized)
@@ -416,12 +421,6 @@ void CDAudio_Shutdown(void)
 	CDAudio_Stop();
 	close(cdfile);
 	cdfile = -1;
+	initialized = false;
 }
 
-void CDAudio_Open(void)
-{
-}
-
-void CDAudio_Close(void)
-{
-}