From 3607b79d7d584e2b37c0ef84baa23df0bacc2c67 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Tue, 12 Sep 2017 21:30:29 +0100 Subject: [PATCH] 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. --- backends/platform/sdl/macosx/macosx.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp index 457746c381d..8ecbe7306c0 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