Moved audio CD initialization / finalization out of the video code so the CD music...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5073 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/host.c b/host.c
index c1aeccfd10d42fbe83586d1b9c887dc54f532812..7a49529f9c8c964db68f0af7cf3d48a4b05c3b0a 100644 (file)
--- a/host.c
+++ b/host.c
@@ -942,6 +942,7 @@ void Host_Init (void)
        if (cls.state != ca_dedicated)
        {
                VID_Open();
+               CDAudio_Startup();
                CL_InitTEnts ();  // We must wait after sound startup to load tent sounds
                SCR_BeginLoadingPlaque();
                MR_Init();

diff --git a/vid_shared.c b/vid_shared.c
index 350466c35e3f97aa574000cf4a91dea42dec69cc..2d9a81d9888252daa2eabff09ef055a000b2a8f7 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -1007,12 +1007,10 @@ static void VID_OpenSystems(void)
 {
        R_Modules_Start();
        S_Startup();
-       CDAudio_Startup();
 }
 
 static void VID_CloseSystems(void)
 {
-       CDAudio_Shutdown();
        S_Shutdown();
        R_Modules_Shutdown();
 }