diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-24 01:26:51 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-24 01:26:51 +0000 |
| commit | fbe63afdd0785b5a5813453800a581c166112328 (patch) | |
| tree | 1ea6e81feef4917b379a9b7ac0d33fb02f381482 | |
| parent | 4bfc084c4974ecff94e273a7608ebc38f1c046ab (diff) | |
| download | ioquake3-aero-fbe63afdd0785b5a5813453800a581c166112328.tar.gz ioquake3-aero-fbe63afdd0785b5a5813453800a581c166112328.zip | |
* Removed the redundant "sound system is muted" message
* 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
git-svn-id: svn://svn.icculus.org/quake3/trunk@102 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | code/client/snd_dma.c | 4 | ||||
| -rw-r--r-- | code/unix/sdl_snd.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/code/client/snd_dma.c b/code/client/snd_dma.c index ad027c0..758f988 100644 --- a/code/client/snd_dma.c +++ b/code/client/snd_dma.c @@ -109,10 +109,6 @@ void S_SoundInfo_f(void) { if (!s_soundStarted) { Com_Printf ("sound system not started\n"); } else { - if ( s_soundMuted ) { - Com_Printf ("sound system is muted\n"); - } - Com_Printf("%5d stereo\n", dma.channels - 1); Com_Printf("%5d samples\n", dma.samples); Com_Printf("%5d samplebits\n", dma.samplebits); diff --git a/code/unix/sdl_snd.c b/code/unix/sdl_snd.c index 39fc933..fe68505 100644 --- a/code/unix/sdl_snd.c +++ b/code/unix/sdl_snd.c @@ -213,6 +213,8 @@ qboolean SNDDMA_Init(void) desired.channels = (int) sndchannels->value; desired.callback = sdl_audio_callback; + print_audiospec("Format we requested from SDL audio device", &desired); + if (SDL_OpenAudio(&desired, &obtained) == -1) { Com_Printf("SDL_OpenAudio() failed: %s\n", SDL_GetError()); @@ -220,7 +222,6 @@ qboolean SNDDMA_Init(void) return qfalse; } // if - print_audiospec("Format we requested from SDL audio device", &desired); print_audiospec("Format we actually got", &obtained); // 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) val <<= 1; - val >>= 1; Com_Printf("WARNING: sdlmixsamps wasn't a power of two (%d)," " so we made it one (%d).\n", tmp, val); tmp = val; |