fix some bugs with cgGL path

[xonotic/darkplaces.git] / snd_main.c

diff --git a/snd_main.c b/snd_main.c
index f5351c9bebfac1f71a0c5805399a72745858c323..6bd0b361c93a4ce6bf4257248af1b8791dc7844e 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -171,6 +171,7 @@ cvar_t snd_spatialization_occlusion = {CVAR_SAVE, "snd_spatialization_occlusion"
 
 // Cvars declared in snd_main.h (shared with other snd_*.c files)
 cvar_t _snd_mixahead = {CVAR_SAVE, "_snd_mixahead", "0.15", "how much sound to mix ahead of time"};
+cvar_t snd_streaming = { CVAR_SAVE, "snd_streaming", "1", "enables keeping compressed ogg sound files compressed, decompressing them only as needed, otherwise they will be decompressed completely at load (may use a lot of memory)"};
 cvar_t snd_swapstereo = {CVAR_SAVE, "snd_swapstereo", "0", "swaps left/right speakers for old ISA soundblaster cards"};
 extern cvar_t v_flipped;
 cvar_t snd_channellayout = {0, "snd_channellayout", "0", "channel layout. Can be 0 (auto - snd_restart needed), 1 (standard layout), or 2 (ALSA layout)"};
@@ -261,7 +262,7 @@ static void S_Play_Common (float fvol, float attenuation)
                        ch_ind = S_StartSound (-1, 0, sfx, listener_origin, fvol, attenuation);
 
                        // Free the sfx if the file didn't exist
-                       if (ch_ind < 0)
+                       if (!sfx->fetcher)
                                S_FreeSfx (sfx, false);
                        else
                                channels[ch_ind].flags |= CHANNELFLAG_LOCALSOUND;
@@ -844,6 +845,7 @@ void S_Init(void)
        Cvar_RegisterVariable(&nosound);
        Cvar_RegisterVariable(&snd_precache);
        Cvar_RegisterVariable(&snd_initialized);
+       Cvar_RegisterVariable(&snd_streaming);
        Cvar_RegisterVariable(&ambient_level);
        Cvar_RegisterVariable(&ambient_fade);
        Cvar_RegisterVariable(&snd_noextraupdate);