yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent music from playing even if ogg_enabled is 0.

Browse source 
ogg_enabled doesn't prevent music from playing, it just toggles if the
ogg backend should be enabled or not. If the user does something like
`ogg_enable=0; snd_restart` everything is okay. If they just set
`ogg_enable=0` strange things happen because the backend stays
initialized and will play tracks as requested. Work around the by
shutting the backend down if `ogg_enable == 0 && ogg_started == true`.

Closes #583.
This commit is contained in:
Yamagi 2020-06-30 14:38:28 +02:00
parent 06436d0d30
commit 2ab4e5553a
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/client/sound/ogg.c
View file

@ -40,7 +40,8 @@
#define STB_VORBIS_NO_PUSHDATA_API
#include "header/stb_vorbis.h"
static cvar_t *ogg_shuffle; /* Shuffle playback */
static cvar_t *ogg_enabled; /* Backend is enabled */
static cvar_t *ogg_shuffle; /* Shuffle playback */
static cvar_t *ogg_ignoretrack0; /* Toggle track 0 playing */
static cvar_t *ogg_volume; /* Music volume. */
static int ogg_curfile; /* Index of currently played file. */
@ -275,6 +276,15 @@ OGG_Stream(void)
return;
}
/* OGG playback was disabled since the last package frame.
Shutdown the backend to stop all playing tracks and to
prevend OGG_PLayTrack() from starting new ones. */
if (ogg_enabled->value != 1)
{
OGG_Shutdown();
return;
}
if (ogg_status == PLAY)
{
#ifdef USE_OPENAL
@ -329,6 +339,11 @@ OGG_PlayTrack(int trackNo)
return; // sound is not initialized
}
if (ogg_started == false)
{
return;
}
// Track 0 means "stop music".
if(trackNo == 0)
{
@ -647,8 +662,7 @@ OGG_Init(void)
ogg_shuffle = Cvar_Get("ogg_shuffle", "0", CVAR_ARCHIVE);
ogg_ignoretrack0 = Cvar_Get("ogg_ignoretrack0", "0", CVAR_ARCHIVE);
ogg_volume = Cvar_Get("ogg_volume", "0.7", CVAR_ARCHIVE);
cvar_t *ogg_enabled = Cvar_Get("ogg_enable", "1", CVAR_ARCHIVE);
ogg_enabled = Cvar_Get("ogg_enable", "1", CVAR_ARCHIVE);
if (ogg_enabled->value != 1)
{
@ -680,7 +694,7 @@ OGG_Shutdown(void)
// Music must be stopped.
OGG_Stop();
// Free file lsit.
// Free file list.
for(int i=0; i<MAX_NUM_OGGTRACKS; ++i)
{
if(ogg_tracks[i] != NULL)