fixed a couple warnings on memsetting shm

[xonotic/darkplaces.git] / cd_linux.c

diff --git a/cd_linux.c b/cd_linux.c
index de4da156bc1175cf6eadcc7f4bb08696ab8e76c7..c502e0ace8d21d0135be85242c2d614fc524387e 100644 (file)
--- 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)
-{
-}