extern void CDAudio_SysEject (void);
extern void CDAudio_SysCloseDoor (void);
extern int CDAudio_SysGetAudioDiskInfo (void);
+extern float CDAudio_SysGetVolume (void);
+extern void CDAudio_SysSetVolume (float volume);
extern int CDAudio_SysPlay (qbyte track);
extern int CDAudio_SysStop (void);
extern int CDAudio_SysPause (void);
static qbyte maxTrack;
static int faketrack = -1;
+static float saved_vol = 1.0f;
+
// exported variables
qboolean cdValid = false;
qboolean cdPlaying = false;
sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false);
if (sfx != NULL)
{
- faketrack = S_StartSound (-1, 0, sfx, vec3_origin, 1, 0);
+ faketrack = S_StartSound (-1, 0, sfx, vec3_origin, cdvolume, 0);
if (faketrack != -1)
{
if (looping)
if (track > maxTrack)
{
- Con_DPrintf("CDAudio: Bad track number %u.\n", track);
+ Con_Printf("CDAudio: Bad track number %u.\n", track);
return;
}
void CDAudio_Resume (void)
{
- if (!enabled || !wasPlaying)
+ if (!enabled || cdPlaying || !wasPlaying)
return;
if (faketrack != -1)
}
}
-void CDAudio_Update (void)
+void CDAudio_SetVolume (float newvol)
{
- if (!enabled)
+ // If the volume hasn't changed
+ if (newvol == cdvolume)
return;
- if (bgmvolume.value != cdvolume)
+ // If the CD has been muted
+ if (newvol == 0.0f)
+ CDAudio_Pause ();
+ else
{
- if (cdvolume)
- {
- Cvar_SetValueQuick (&bgmvolume, 0.0);
- cdvolume = bgmvolume.value;
- CDAudio_Pause ();
- }
- else
- {
- Cvar_SetValueQuick (&bgmvolume, 1.0);
- cdvolume = bgmvolume.value;
+ // If the CD has been unmuted
+ if (cdvolume == 0.0f)
CDAudio_Resume ();
- }
+
+ if (faketrack != -1)
+ S_SetChannelVolume (faketrack, newvol);
+ CDAudio_SysSetVolume (newvol);
}
+ cdvolume = newvol;
+}
+
+void CDAudio_Update (void)
+{
+ if (!enabled)
+ return;
+
+ CDAudio_SetVolume (bgmvolume.value);
+
if (faketrack == -1)
CDAudio_SysUpdate();
}
cdValid = false;
}
+ saved_vol = CDAudio_SysGetVolume ();
+ if (saved_vol < 0.0f)
+ {
+ Con_DPrint ("Can't get initial CD volume\n");
+ saved_vol = 1.0f;
+ }
+ else
+ Con_DPrintf ("Initial CD volume: %g\n", saved_vol);
+
initialized = true;
Con_DPrint("CD Audio Initialized\n");
{
if (!initialized)
return;
+
+ CDAudio_SysSetVolume (saved_vol);
+
CDAudio_Stop();
CDAudio_SysShutdown();
initialized = false;