diff options
| author | Max Horn | 2011-04-19 15:09:21 +0200 |
|---|---|---|
| committer | Max Horn | 2011-04-19 15:09:50 +0200 |
| commit | c37f36d0a87917a72afd860a960f8c83f8d0552d (patch) | |
| tree | 03b61c0b2b6c72bbbad26d765e9727d852716a5a /backends/platform | |
| parent | 5985320c5e61a1abdbf1d097e0f1c6df6b5eff99 (diff) | |
| download | scummvm-rg350-c37f36d0a87917a72afd860a960f8c83f8d0552d.tar.gz scummvm-rg350-c37f36d0a87917a72afd860a960f8c83f8d0552d.tar.bz2 scummvm-rg350-c37f36d0a87917a72afd860a960f8c83f8d0552d.zip | |
GPH: Replace defunct MIXER_DOUBLE_BUFFERING by working code
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/gph/gph-backend.cpp | 21 | ||||
| -rw-r--r-- | backends/platform/gph/gph-sdl.h | 1 |
2 files changed, 14 insertions, 8 deletions
diff --git a/backends/platform/gph/gph-backend.cpp b/backends/platform/gph/gph-backend.cpp index 0432974246..fddcd03d85 100644 --- a/backends/platform/gph/gph-backend.cpp +++ b/backends/platform/gph/gph-backend.cpp @@ -26,23 +26,22 @@ #include "backends/platform/sdl/sdl-sys.h" // #include "backends/platform/gph/gph-options.h" -#include "backends/platform/gph/gph-sdl.h" +#include "backends/mixer/doublebuffersdl/doublebuffersdl-mixer.h" #include "backends/platform/gph/gph-hw.h" +#include "backends/platform/gph/gph-sdl.h" #include "backends/plugins/posix/posix-provider.h" +#include "backends/saves/default/default-saves.h" +#include "backends/timer/default/default-timer.h" + #include "base/main.h" #include "common/archive.h" #include "common/config-manager.h" #include "common/debug.h" #include "common/events.h" -#include "common/util.h" - #include "common/file.h" -#include "base/main.h" - -#include "backends/saves/default/default-saves.h" +#include "common/util.h" -#include "backends/timer/default/default-timer.h" #include "audio/mixer_intern.h" #include <stdio.h> @@ -67,6 +66,14 @@ void OSystem_GPH::initBackend() { _graphicsManager = new GPHGraphicsManager(_eventSource); } + // Create the mixer manager + if (_mixer == 0) { + _mixerManager = new DoubleBufferSDLMixerManager(); + + // Setup and start mixer + _mixerManager->init(); + } + /* Setup default save path to be workingdir/saves */ char savePath[PATH_MAX+1]; diff --git a/backends/platform/gph/gph-sdl.h b/backends/platform/gph/gph-sdl.h index 51c609d29e..68a641eed7 100644 --- a/backends/platform/gph/gph-sdl.h +++ b/backends/platform/gph/gph-sdl.h @@ -32,7 +32,6 @@ #include "backends/events/gph/gph-events.h" #define __GP2XWIZ__ -#define MIXER_DOUBLE_BUFFERING 1 #ifndef PATH_MAX #define PATH_MAX 255 |