cd audio now tied to sound system

[xonotic/darkplaces.git] / vid_shared.c

diff --git a/vid_shared.c b/vid_shared.c
index 4bdc2e096aa2b9276b32c9a1edba52de97c9fc05..6c844d924aff1eb2f38a2ff954f60577066fb539 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -54,8 +54,7 @@ unsigned short vid_systemgammaramps[768];
 cvar_t vid_fullscreen = {CVAR_SAVE, "vid_fullscreen", "1"};
 cvar_t vid_width = {CVAR_SAVE, "vid_width", "640"};
 cvar_t vid_height = {CVAR_SAVE, "vid_height", "480"};
-cvar_t vid_bitsperpixel = {CVAR_SAVE, "vid_bitsperpixel", "16"};
-cvar_t vid_stencil = {CVAR_SAVE, "vid_stencil", "0"};
+cvar_t vid_bitsperpixel = {CVAR_SAVE, "vid_bitsperpixel", "32"};
 
 cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1"};
 cvar_t gl_combine = {CVAR_SAVE, "gl_combine", "1"};
@@ -414,7 +413,7 @@ static dllfunction_t wglvarfuncs[] =
 
 void VID_CheckExtensions(void)
 {
-       gl_stencil = vid_stencil.integer;
+       gl_stencil = vid_bitsperpixel.integer == 32;
        gl_combine_extension = false;
        gl_dot3arb = false;
        gl_supportslockarrays = false;
@@ -667,7 +666,6 @@ void VID_Shared_Init(void)
        Cvar_RegisterVariable(&vid_width);
        Cvar_RegisterVariable(&vid_height);
        Cvar_RegisterVariable(&vid_bitsperpixel);
-       Cvar_RegisterVariable(&vid_stencil);
        Cvar_RegisterVariable(&vid_mouse);
        Cvar_RegisterVariable(&gl_combine);
        Cvar_RegisterVariable(&in_pitch_min);
@@ -683,23 +681,20 @@ int current_vid_fullscreen;
 int current_vid_width;
 int current_vid_height;
 int current_vid_bitsperpixel;
-int current_vid_stencil;
-extern int VID_InitMode (int fullscreen, int width, int height, int bpp, int stencil);
-int VID_Mode(int fullscreen, int width, int height, int bpp, int stencil)
+extern int VID_InitMode (int fullscreen, int width, int height, int bpp);
+int VID_Mode(int fullscreen, int width, int height, int bpp)
 {
-       Con_Printf("Video: %s %dx%dx%d %s\n", fullscreen ? "fullscreen" : "window", width, height, bpp, stencil ? "with stencil" : "without stencil");
-       if (VID_InitMode(fullscreen, width, height, bpp, stencil))
+       Con_Printf("Video: %s %dx%dx%d\n", fullscreen ? "fullscreen" : "window", width, height, bpp);
+       if (VID_InitMode(fullscreen, width, height, bpp))
        {
                current_vid_fullscreen = fullscreen;
                current_vid_width = width;
                current_vid_height = height;
                current_vid_bitsperpixel = bpp;
-               current_vid_stencil = stencil;
                Cvar_SetValueQuick(&vid_fullscreen, fullscreen);
                Cvar_SetValueQuick(&vid_width, width);
                Cvar_SetValueQuick(&vid_height, height);
                Cvar_SetValueQuick(&vid_bitsperpixel, bpp);
-               Cvar_SetValueQuick(&vid_stencil, stencil);
                return true;
        }
        else
@@ -709,27 +704,27 @@ int VID_Mode(int fullscreen, int width, int height, int bpp, int stencil)
 static void VID_OpenSystems(void)
 {
        R_Modules_Start();
-       S_Open();
-       CDAudio_Open();
+       S_Startup();
+       CDAudio_Startup();
 }
 
 static void VID_CloseSystems(void)
 {
-       CDAudio_Close();
-       S_Close();
+       CDAudio_Shutdown();
+       S_Shutdown();
        R_Modules_Shutdown();
 }
 
 void VID_Restart_f(void)
 {
-       Con_Printf("VID_Restart: changing from %s %dx%dx%dbpp %s, to %s %dx%dx%dbpp %s.\n",
-               current_vid_fullscreen ? "fullscreen" : "window", current_vid_width, current_vid_height, current_vid_bitsperpixel, current_vid_stencil ? "with stencil" : "without stencil",
-               vid_fullscreen.integer ? "fullscreen" : "window", vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_stencil.integer ? "with stencil" : "without stencil");
+       Con_Printf("VID_Restart: changing from %s %dx%dx%dbpp, to %s %dx%dx%dbpp.\n",
+               current_vid_fullscreen ? "fullscreen" : "window", current_vid_width, current_vid_height, current_vid_bitsperpixel,
+               vid_fullscreen.integer ? "fullscreen" : "window", vid_width.integer, vid_height.integer, vid_bitsperpixel.integer);
        VID_Close();
-       if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_stencil.integer))
+       if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer))
        {
                Con_Printf("Video mode change failed\n");
-               if (!VID_Mode(current_vid_fullscreen, current_vid_width, current_vid_height, current_vid_bitsperpixel, current_vid_stencil))
+               if (!VID_Mode(current_vid_fullscreen, current_vid_width, current_vid_height, current_vid_bitsperpixel))
                        Sys_Error("Unable to restore to last working video mode\n");
        }
        VID_OpenSystems();
@@ -763,33 +758,20 @@ void VID_Open(void)
                        Cvar_SetValueQuick(&vid_height, height);
                if ((i = COM_CheckParm("-bpp")) != 0)
                        Cvar_SetQuick(&vid_bitsperpixel, com_argv[i+1]);
-               if ((i = COM_CheckParm("-nostencil")) != 0)
-                       Cvar_SetValueQuick(&vid_stencil, 0);
-               if ((i = COM_CheckParm("-stencil")) != 0)
-                       Cvar_SetValueQuick(&vid_stencil, 1);
-       }
-
-       if (vid_stencil.integer && vid_bitsperpixel.integer != 32)
-       {
-               Con_Printf("vid_stencil not allowed without vid_bitsperpixel 32, turning off vid_stencil\n");
-               Cvar_SetValueQuick(&vid_stencil, 0);
        }
 
        Con_DPrintf("Starting video system\n");
-       if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_stencil.integer))
+       if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer))
        {
                Con_Printf("Desired video mode fail, trying fallbacks...\n");
-               if (!vid_stencil.integer || !VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, false))
+               if (vid_fullscreen.integer)
                {
-                       if (vid_fullscreen.integer)
-                       {
-                               if (!VID_Mode(true, 640, 480, 16, false))
-                                       if (!VID_Mode(false, 640, 480, 16, false))
-                                               Sys_Error("Video modes failed\n");
-                       }
-                       else
-                               Sys_Error("Windowed video failed\n");
+                       if (!VID_Mode(true, 640, 480, 16))
+                               if (!VID_Mode(false, 640, 480, 16))
+                                       Sys_Error("Video modes failed\n");
                }
+               else
+                       Sys_Error("Windowed video failed\n");
        }
        VID_OpenSystems();
 }