aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/sdl
diff options
context:
space:
mode:
authorChristopher Page2008-05-28 20:30:20 +0000
committerChristopher Page2008-05-28 20:30:20 +0000
commit8297ead2671e43963098a3dc41e8e75fdbce4ddc (patch)
tree72b0e2bb7d03e461cc157ea5f093261ab902fbfb /backends/platform/sdl
parent3c0e72bb25f83120f0320782793af64213cbd1c2 (diff)
parent057af1000f5187a93fc1ac1a5f61a7a6a382bf03 (diff)
downloadscummvm-rg350-8297ead2671e43963098a3dc41e8e75fdbce4ddc.tar.gz
scummvm-rg350-8297ead2671e43963098a3dc41e8e75fdbce4ddc.tar.bz2
scummvm-rg350-8297ead2671e43963098a3dc41e8e75fdbce4ddc.zip
Merged revisions 32124,32126-32128,32131,32133,32135-32144,32146-32153,32155-32163,32165-32168,32170-32173,32175-32179,32181-32191,32193-32202,32204-32205,32209-32214,32216,32218,32220-32235,32237-32266,32269-32271,32273-32290,32292-32295,32297-32317,32319-32323,32325-32328,32330-32331,32334-32338,32343-32347 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk svn-id: r32350
Diffstat (limited to 'backends/platform/sdl')
-rw-r--r--backends/platform/sdl/sdl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 866f5299a0..b750864ad8 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -403,10 +403,10 @@ bool OSystem_SDL::setSoundCallback(SoundProc proc, void *param) {
_samplesPerSec = SAMPLES_PER_SEC;
// Determine the sample buffer size. We want it to store enough data for
- // about 1/10th of a second. Note that it must be a power of two.
+ // about 1/32th of a second. Note that it must be a power of two.
// So e.g. at 22050 Hz, we request a sample buffer size of 2048.
- int samples = 0x8000;
- while (10 * samples >= _samplesPerSec) {
+ int samples = 8192;
+ while (32 * samples >= _samplesPerSec) {
samples >>= 1;
}