changed bgmvolume/volume to always be registered, sliders for them always work (even...

[xonotic/darkplaces.git] / cd_linux.c

diff --git a/cd_linux.c b/cd_linux.c
index 5a37ff2075f2bf778320a10b1b50fbc82afd31ec..bdfea6068879c8c2956f0ca3297ed26c8c15cbde 100644 (file)
--- a/cd_linux.c
+++ b/cd_linux.c
@@ -35,6 +35,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
 
 #include "quakedef.h"
 

+// used by menu to ghost CD audio slider
+qboolean cdaudioinitialized = false;

 static qboolean cdValid = false;
 static qboolean        playing = false;
 static qboolean        wasPlaying = false;
 static qboolean cdValid = false;
 static qboolean        playing = false;
 static qboolean        wasPlaying = false;


@@ -202,7 +204,7 @@ void CDAudio_Resume(void)
        if (!wasPlaying)
                return;
        
        if (!wasPlaying)
                return;
        

-       if ( ioctl(cdfile, CDROMRESUME) == -1 ) 
+       if ( ioctl(cdfile, CDROMRESUME) == -1 )

                Con_DPrintf("ioctl cdromresume failed\n");
        playing = true;
 }
                Con_DPrintf("ioctl cdromresume failed\n");
        playing = true;
 }


@@ -337,13 +339,13 @@ void CDAudio_Update(void)
        {
                if (cdvolume)
                {
        {
                if (cdvolume)
                {

-                       Cvar_SetValue ("bgmvolume", 0.0);
+                       Cvar_SetValueQuick (&bgmvolume, 0.0);

                        cdvolume = bgmvolume.value;
                        CDAudio_Pause ();
                }
                else
                {
                        cdvolume = bgmvolume.value;
                        CDAudio_Pause ();
                }
                else
                {

-                       Cvar_SetValue ("bgmvolume", 1.0);
+                       Cvar_SetValueQuick (&bgmvolume, 1.0);

                        cdvolume = bgmvolume.value;
                        CDAudio_Resume ();
                }
                        cdvolume = bgmvolume.value;
                        CDAudio_Resume ();
                }


@@ -389,6 +391,7 @@ int CDAudio_Init(void)
 
        for (i = 0; i < 100; i++)
                remap[i] = i;
 
        for (i = 0; i < 100; i++)
                remap[i] = i;

+       cdaudioinitialized = true;

        initialized = true;
        enabled = true;
 
        initialized = true;
        enabled = true;