Use the same default volume on all platforms again

Testing showed that after the last round of sound changes FreeBSD is the
only platform with distorted sound when s_volume is set too high. I'm
pretty sure that it's caused by a bug in the OSS backend of openal-soft.
I'll need to analyze this more and maybe write a problem report. Since
FreeBSD users should be experienced enough to lower the volume when
there are problem (there's a FAQ in our README!), use the same default
volume on all platforms.
This commit is contained in:
Yamagi Burmeister 2013-04-21 12:02:38 +02:00
parent 3ac88e1bda
commit 277c2b9567
2 changed files with 0 additions and 14 deletions

View file

@ -92,12 +92,7 @@ OGG_Init(void)
ogg_check = Cvar_Get("ogg_check", "0", CVAR_ARCHIVE);
ogg_playlist = Cvar_Get("ogg_playlist", "playlist", CVAR_ARCHIVE);
ogg_sequence = Cvar_Get("ogg_sequence", "loop", CVAR_ARCHIVE);
#ifdef __linux__
ogg_volume = Cvar_Get("ogg_volume", "0.7", CVAR_ARCHIVE);
#else
ogg_volume = Cvar_Get("ogg_volume", "0.3", CVAR_ARCHIVE);
#endif
/* Console commands. */
Cmd_AddCommand("ogg_list", OGG_ListCmd);

View file

@ -1008,16 +1008,7 @@ S_Init(void)
return;
}
/*
* On Linux the standard volume is higher
* because ALSA is relative silent.
*/
#ifdef __linux__
s_volume = Cvar_Get("s_volume", "0.7", CVAR_ARCHIVE);
#else
s_volume = Cvar_Get("s_volume", "0.3", CVAR_ARCHIVE);
#endif
s_khz = Cvar_Get("s_khz", "44", CVAR_ARCHIVE);
s_loadas8bit = Cvar_Get("s_loadas8bit", "0", CVAR_ARCHIVE);
s_mixahead = Cvar_Get("s_mixahead", "0.14", CVAR_ARCHIVE);