diff options
| author | Thierry Crozat | 2017-09-12 21:30:29 +0100 |
|---|---|---|
| committer | Thierry Crozat | 2017-09-12 21:30:29 +0100 |
| commit | 3607b79d7d584e2b37c0ef84baa23df0bacc2c67 (patch) | |
| tree | 23f4f75a5670d94a4dfa3857746139b52f348b95 | |
| parent | 738e56268a9452f41c77e5208df57eaec5782db9 (diff) | |
| download | scummvm-rg350-3607b79d7d584e2b37c0ef84baa23df0bacc2c67.tar.gz scummvm-rg350-3607b79d7d584e2b37c0ef84baa23df0bacc2c67.tar.bz2 scummvm-rg350-3607b79d7d584e2b37c0ef84baa23df0bacc2c67.zip | |
MACOSX: Remove mixer init from derived class for macosx backend
Since the macosx backend now does the same as the base SDL backend
we can just let the base class do its stuff.
| -rw-r--r-- | backends/platform/sdl/macosx/macosx.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp index 457746c381..8ecbe7306c 100644 --- a/backends/platform/sdl/macosx/macosx.cpp +++ b/backends/platform/sdl/macosx/macosx.cpp @@ -28,7 +28,6 @@ #ifdef MACOSX #include "backends/audiocd/macosx/macosx-audiocd.h" -#include "backends/mixer/doublebuffersdl/doublebuffersdl-mixer.h" #include "backends/platform/sdl/macosx/appmenu_osx.h" #include "backends/platform/sdl/macosx/macosx.h" #include "backends/updates/macosx/macosx-updates.h" @@ -62,14 +61,6 @@ void OSystem_MacOSX::init() { } void OSystem_MacOSX::initBackend() { - // Create the mixer manager - if (_mixer == 0) { - _mixerManager = new SdlMixerManager(); - - // Setup and start mixer - _mixerManager->init(); - } - #ifdef USE_TRANSLATION // We need to initialize the translataion manager here for the following // call to replaceApplicationMenuItems() work correctly |