diff options
| author | athrxx | 2011-04-21 20:29:25 +0200 |
|---|---|---|
| committer | athrxx | 2011-04-21 20:29:25 +0200 |
| commit | 204644b001d85612742426b5731b8149b0a24f2e (patch) | |
| tree | 8e19872f056e773335536b5cb6a70d3e3f55f75f /backends/platform/gph/gph-backend.cpp | |
| parent | b0008d2d33c394fbba358c08b032c5872e6a909d (diff) | |
| parent | 44e79c70fa2908e0abdb7c9effa1dd039404a520 (diff) | |
| download | scummvm-rg350-204644b001d85612742426b5731b8149b0a24f2e.tar.gz scummvm-rg350-204644b001d85612742426b5731b8149b0a24f2e.tar.bz2 scummvm-rg350-204644b001d85612742426b5731b8149b0a24f2e.zip | |
Merge branch 'master' of https://github.com/scummvm/scummvm
Diffstat (limited to 'backends/platform/gph/gph-backend.cpp')
| -rw-r--r-- | backends/platform/gph/gph-backend.cpp | 21 |
1 files changed, 14 insertions, 7 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]; |