ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2025-03-05 15:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Removed the redundant "sound system is muted" message

Browse source 
* Moved printing of desired audiospec to before SDL_OpenAudio
* When the computed value for samples is not a power of 2, now pick the smallest power of 2 greater rather than the largest power of 2 smaller
This commit is contained in:
Tim Angus 2005-09-24 01:26:51 +00:00
parent fe14a45ad1
commit f0bd20e00a
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/client/snd_dma.c
View file

@ -109,10 +109,6 @@ void S_SoundInfo_f(void) {
if (!s_soundStarted) { if (!s_soundStarted) {
Com_Printf ("sound system not started\n"); Com_Printf ("sound system not started\n");
} else { } else {
if ( s_soundMuted ) {
Com_Printf ("sound system is muted\n");
}
Com_Printf("%5d stereo\n", dma.channels - 1); Com_Printf("%5d stereo\n", dma.channels - 1);
Com_Printf("%5d samples\n", dma.samples); Com_Printf("%5d samples\n", dma.samples);
Com_Printf("%5d samplebits\n", dma.samplebits); Com_Printf("%5d samplebits\n", dma.samplebits);

4
code/unix/sdl_snd.c
View file

@ -213,6 +213,8 @@ qboolean SNDDMA_Init(void)
desired.channels = (int) sndchannels->value; desired.channels = (int) sndchannels->value;
desired.callback = sdl_audio_callback; desired.callback = sdl_audio_callback;
print_audiospec("Format we requested from SDL audio device", &desired);
if (SDL_OpenAudio(&desired, &obtained) == -1) if (SDL_OpenAudio(&desired, &obtained) == -1)
{ {
Com_Printf("SDL_OpenAudio() failed: %s\n", SDL_GetError()); Com_Printf("SDL_OpenAudio() failed: %s\n", SDL_GetError());
@ -220,7 +222,6 @@ qboolean SNDDMA_Init(void)
return qfalse; return qfalse;
} // if } // if
print_audiospec("Format we requested from SDL audio device", &desired);
print_audiospec("Format we actually got", &obtained); print_audiospec("Format we actually got", &obtained);
// dma.samples needs to be big, or id's mixer will just refuse to // dma.samples needs to be big, or id's mixer will just refuse to
@ -240,7 +241,6 @@ qboolean SNDDMA_Init(void)
while (val < tmp) while (val < tmp)
val <<= 1; val <<= 1;
val >>= 1;
Com_Printf("WARNING: sdlmixsamps wasn't a power of two (%d)," Com_Printf("WARNING: sdlmixsamps wasn't a power of two (%d),"
" so we made it one (%d).\n", tmp, val); " so we made it one (%d).\n", tmp, val);
tmp = val; tmp = val;