diff options
| author | Max Horn | 2011-04-19 15:09:35 +0200 |
|---|---|---|
| committer | Max Horn | 2011-04-19 15:09:50 +0200 |
| commit | b49f313dd4c735d4598441584ec0d8dca0b5489c (patch) | |
| tree | 4818437a2bcbeb960255cc8df0c43ab7dbb75af6 /backends/platform | |
| parent | c37f36d0a87917a72afd860a960f8c83f8d0552d (diff) | |
| download | scummvm-rg350-b49f313dd4c735d4598441584ec0d8dca0b5489c.tar.gz scummvm-rg350-b49f313dd4c735d4598441584ec0d8dca0b5489c.tar.bz2 scummvm-rg350-b49f313dd4c735d4598441584ec0d8dca0b5489c.zip | |
OPENPANDORA: Replace defunct MIXER_DOUBLE_BUFFERING by working code
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/openpandora/op-backend.cpp | 17 | ||||
| -rw-r--r-- | backends/platform/openpandora/op-sdl.h | 1 |
2 files changed, 11 insertions, 7 deletions
diff --git a/backends/platform/openpandora/op-backend.cpp b/backends/platform/openpandora/op-backend.cpp index 5b333929c9..4c29636e40 100644 --- a/backends/platform/openpandora/op-backend.cpp +++ b/backends/platform/openpandora/op-backend.cpp @@ -26,20 +26,17 @@ #include "backends/platform/openpandora/op-sdl.h" #include "base/main.h" +#include "backends/mixer/doublebuffersdl/doublebuffersdl-mixer.h" #include "backends/saves/default/default-saves.h" +#include "backends/timer/default/default-timer.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> @@ -78,6 +75,14 @@ void OSystem_OP::initBackend() { // } // + // 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/openpandora/op-sdl.h b/backends/platform/openpandora/op-sdl.h index 93c82ca397..9d92472b17 100644 --- a/backends/platform/openpandora/op-sdl.h +++ b/backends/platform/openpandora/op-sdl.h @@ -32,7 +32,6 @@ #include "backends/graphics/openpandora/op-graphics.h" #define __OPENPANDORA__ -#define MIXER_DOUBLE_BUFFERING 1 #ifndef PATH_MAX #define PATH_MAX 255 |