summaryrefslogtreecommitdiff
path: root/pcsound
diff options
context:
space:
mode:
authorSimon Howard2009-05-07 21:59:38 +0000
committerSimon Howard2009-05-07 21:59:38 +0000
commitcc93c797921f08d48ac8dfc64fefcf7725a84517 (patch)
treee7cc9351488dff129417e3cc50444bfec9ffaecc /pcsound
parent5859134e1c81d15e49cab4c1971ed2bce5781845 (diff)
downloadchocolate-doom-cc93c797921f08d48ac8dfc64fefcf7725a84517.tar.gz
chocolate-doom-cc93c797921f08d48ac8dfc64fefcf7725a84517.tar.bz2
chocolate-doom-cc93c797921f08d48ac8dfc64fefcf7725a84517.zip
Calculate SDL buffer size automatically based on sample rate.
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1511
Diffstat (limited to 'pcsound')
-rw-r--r--pcsound/pcsound_sdl.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/pcsound/pcsound_sdl.c b/pcsound/pcsound_sdl.c
index f862dfa7..546e6a36 100644
--- a/pcsound/pcsound_sdl.c
+++ b/pcsound/pcsound_sdl.c
@@ -32,6 +32,7 @@
#include "pcsound.h"
#include "pcsound_internal.h"
+#define SOUND_SLICE_TIME 100 /* ms */
#define SQUARE_WAVE_AMP 0x2000
// If true, we initialised SDL and have the responsibility to shut it
@@ -165,6 +166,8 @@ static void PCSound_SDL_Shutdown(void)
static int PCSound_SDL_Init(pcsound_callback_func callback_func)
{
+ int slicesize;
+
// Check if SDL_mixer has been opened already
// If not, we must initialise it now
@@ -176,7 +179,9 @@ static int PCSound_SDL_Init(pcsound_callback_func callback_func)
return 0;
}
- if (Mix_OpenAudio(pcsound_sample_rate, AUDIO_S16SYS, 2, 1024) < 0)
+ slicesize = (SOUND_SLICE_TIME * pcsound_sample_rate) / 1000;
+
+ if (Mix_OpenAudio(pcsound_sample_rate, AUDIO_S16SYS, 2, slicesize) < 0)
{
fprintf(stderr, "Error initialising SDL_mixer: %s\n", Mix_GetError());