[Scummvm-cvs-logs] scummvm master -> dd4388b73e84b3f1df86cf17ab034dcf286eaaef

lordhoto lordhoto at gmail.com
Sun Jun 29 15:39:07 CEST 2014


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cd306f194c SDL: Default to 44kHz sound output.
e80bdfc5b4 PS3: Default to 44kHz sound output.
dd4388b73e Merge pull request #471 from lordhoto/sdl-default-rate


Commit: cd306f194c7c052b465f5fefc249d52e8386a782
    https://github.com/scummvm/scummvm/commit/cd306f194c7c052b465f5fefc249d52e8386a782
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-22T18:22:50+02:00

Commit Message:
SDL: Default to 44kHz sound output.

Changed paths:
    backends/mixer/sdl/sdl-mixer.cpp



diff --git a/backends/mixer/sdl/sdl-mixer.cpp b/backends/mixer/sdl/sdl-mixer.cpp
index 7c709e9..e3b15b8 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()
 	:


Commit: e80bdfc5b4f20d330637acb874466569e59eb6ea
    https://github.com/scummvm/scummvm/commit/e80bdfc5b4f20d330637acb874466569e59eb6ea
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-22T18:23:05+02:00

Commit Message:
PS3: Default to 44kHz sound output.

Changed paths:
    backends/mixer/sdl13/sdl13-mixer.cpp



diff --git a/backends/mixer/sdl13/sdl13-mixer.cpp b/backends/mixer/sdl13/sdl13-mixer.cpp
index f9894a6..dc38242 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()
 	:


Commit: dd4388b73e84b3f1df86cf17ab034dcf286eaaef
    https://github.com/scummvm/scummvm/commit/dd4388b73e84b3f1df86cf17ab034dcf286eaaef
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2014-06-29T15:38:37+02:00

Commit Message:
Merge pull request #471 from lordhoto/sdl-default-rate

SDL: Default audio output rate to 44kHz.

Changed paths:
    backends/mixer/sdl/sdl-mixer.cpp
    backends/mixer/sdl13/sdl13-mixer.cpp









More information about the Scummvm-git-logs mailing list