- SFXs no longer allocate mempools, they use the sound mempool directly.

[xonotic/darkplaces.git] / snd_sdl.c

diff --git a/snd_sdl.c b/snd_sdl.c
index b673dfa9a58b9c13ec71c1fe628418363f900570..ddd87fe1be57b146add9ec919c7cced29cc371fd 100644 (file)
--- 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 <SDL.h>
 
 /*
@@ -38,7 +39,6 @@ typedef struct AudioState_s
 } AudioState;
 
 
-extern mempool_t *snd_mempool;
 static AudioState       as;
 
 static void Buffer_Callback(void *userdata, Uint8 *stream, int len);
@@ -86,7 +86,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,7 +96,7 @@ qboolean SNDDMA_Init(void)
        shm->format.channels = 2; //stereo
        shm->format.width = 2;
 
-// COMMANDLINEOPTION: -sndspeed <hz> chooses 44100 hz, 22100 hz, or 11025 hz sound output rate
+// COMMANDLINEOPTION: SDL Sound: -sndspeed <hz> 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 ] );
@@ -117,13 +117,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"