aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2014-06-29 15:38:37 +0200
committerJohannes Schickel2014-06-29 15:38:37 +0200
commitdd4388b73e84b3f1df86cf17ab034dcf286eaaef (patch)
tree9f854400cbc65801ba91d19af5d72cace84625c9
parentcc1a570f96660e40c653a569e298ea729703f09e (diff)
parente80bdfc5b4f20d330637acb874466569e59eb6ea (diff)
downloadscummvm-rg350-dd4388b73e84b3f1df86cf17ab034dcf286eaaef.tar.gz
scummvm-rg350-dd4388b73e84b3f1df86cf17ab034dcf286eaaef.tar.bz2
scummvm-rg350-dd4388b73e84b3f1df86cf17ab034dcf286eaaef.zip
Merge pull request #471 from lordhoto/sdl-default-rate
SDL: Default audio output rate to 44kHz.
-rw-r--r--backends/mixer/sdl/sdl-mixer.cpp3
-rw-r--r--backends/mixer/sdl13/sdl13-mixer.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/backends/mixer/sdl/sdl-mixer.cpp b/backends/mixer/sdl/sdl-mixer.cpp
index 7c709e91a3..e3b15b8c59 100644
--- a/backends/mixer/sdl/sdl-mixer.cpp
+++ b/backends/mixer/sdl/sdl-mixer.cpp
@@ -33,9 +33,8 @@
#ifdef GP2X
#define SAMPLES_PER_SEC 11025
#else
-#define SAMPLES_PER_SEC 22050
+#define SAMPLES_PER_SEC 44100
#endif
-//#define SAMPLES_PER_SEC 44100
SdlMixerManager::SdlMixerManager()
:
diff --git a/backends/mixer/sdl13/sdl13-mixer.cpp b/backends/mixer/sdl13/sdl13-mixer.cpp
index f9894a6f91..dc38242bde 100644
--- a/backends/mixer/sdl13/sdl13-mixer.cpp
+++ b/backends/mixer/sdl13/sdl13-mixer.cpp
@@ -33,9 +33,8 @@
#ifdef GP2X
#define SAMPLES_PER_SEC 11025
#else
-#define SAMPLES_PER_SEC 22050
+#define SAMPLES_PER_SEC 44100
#endif
-//#define SAMPLES_PER_SEC 44100
Sdl13MixerManager::Sdl13MixerManager()
: