From: molivier <molivier@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 9 Mar 2005 13:09:35 +0000 (+0000)
Subject: Moved audio CD initialization / finalization out of the video code so the CD music... 
X-Git-Tag: xonotic-v0.1.0preview~5095
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a98b666d915ca5539a748f6d08fc97c193d18272;p=xonotic%2Fdarkplaces.git

Moved audio CD initialization / finalization out of the video code so the CD music doesn't stop playing when doing a vid_restart.


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 c1aeccfd..7a49529f 100644
--- 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 350466c3..2d9a81d9 100644
--- 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();
 }