X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=snd_sdl.c;h=38fb20531a896af68c3432414e07191e7e6b1c56;hb=0ca993946636239ea409f07df745a7dcb745dde4;hp=45b359ac716467c5e0a043cef011d69a5918d9ea;hpb=6068115093a24d125506e021ebc144d720553583;p=xonotic%2Fdarkplaces.git diff --git a/snd_sdl.c b/snd_sdl.c index 45b359ac..38fb2053 100644 --- a/snd_sdl.c +++ b/snd_sdl.c @@ -17,6 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "quakedef.h" +#include "snd_main.h" #include /* @@ -86,7 +87,7 @@ qboolean SNDDMA_Init(void) // Init the SDL Audio subsystem if( SDL_InitSubSystem( SDL_INIT_AUDIO ) ) { - Con_SafePrint( "Initializing the SDL Audio subsystem failed!\n" ); + Con_Print( "Initializing the SDL Audio subsystem failed!\n" ); return false; } @@ -96,6 +97,7 @@ qboolean SNDDMA_Init(void) shm->format.channels = 2; //stereo shm->format.width = 2; +// COMMANDLINEOPTION: SDL Sound: -sndspeed chooses 44100 hz, 22100 hz, or 11025 hz sound output rate i = COM_CheckParm( "-sndspeed" ); if( i && i != ( com_argc - 1 ) ) shm->format.speed = atoi( com_argv[ i+1 ] ); @@ -116,13 +118,13 @@ qboolean SNDDMA_Init(void) // Init the SDL Audio subsystem spec.callback = Buffer_Callback; spec.channels = shm->format.channels; - spec.format = AUDIO_S16LSB; + spec.format = AUDIO_S16SYS; spec.freq = shm->format.speed; spec.userdata = NULL; spec.samples = AUDIO_SDL_SAMPLES; if( SDL_OpenAudio( &spec, NULL ) ) { - Con_SafePrint( "Failed to open the audio device!\n" ); + Con_Print( "Failed to open the audio device!\n" ); Con_DPrintf( "Audio Specification:\n" "\tChannels : %i\n"