From b9a107499911873a0f5e5452d292f6541f0f001a Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Fri, 27 Jun 2014 16:45:58 +0200 Subject: PS3: Make use of an updated SDL2 version This version, available at https://bitbucket.org/bgK/sdl_psl1ght, is based on SDL 2.0.3. --- backends/platform/sdl/ps3/ps3.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'backends/platform/sdl/ps3/ps3.cpp') diff --git a/backends/platform/sdl/ps3/ps3.cpp b/backends/platform/sdl/ps3/ps3.cpp index f111379794..e531d79fba 100644 --- a/backends/platform/sdl/ps3/ps3.cpp +++ b/backends/platform/sdl/ps3/ps3.cpp @@ -31,7 +31,7 @@ #include "backends/saves/default/default-saves.h" #include "backends/fs/ps3/ps3-fs-factory.h" #include "backends/events/ps3sdl/ps3sdl-events.h" -#include "backends/mixer/sdl13/sdl13-mixer.h" +#include "backends/mixer/sdl2/sdl2-mixer.h" #include #include @@ -70,7 +70,7 @@ void OSystem_PS3::initBackend() { // Create the mixer manager if (_mixer == 0) { - _mixerManager = new Sdl13MixerManager(); + _mixerManager = new Sdl2MixerManager(); // Setup and start mixer _mixerManager->init(); -- cgit v1.2.3 From aa9191c4c46183664d2c3f64dbebbb1119067148 Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Sun, 8 Mar 2015 13:18:45 +0100 Subject: PS3: Remove the SDL2 mixer manager. It was only used by the PS3 backend, and the standard SDL mixer was fixed to work in the PS3 case. --- backends/platform/sdl/ps3/ps3.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'backends/platform/sdl/ps3/ps3.cpp') diff --git a/backends/platform/sdl/ps3/ps3.cpp b/backends/platform/sdl/ps3/ps3.cpp index e531d79fba..0bb8300014 100644 --- a/backends/platform/sdl/ps3/ps3.cpp +++ b/backends/platform/sdl/ps3/ps3.cpp @@ -31,7 +31,6 @@ #include "backends/saves/default/default-saves.h" #include "backends/fs/ps3/ps3-fs-factory.h" #include "backends/events/ps3sdl/ps3sdl-events.h" -#include "backends/mixer/sdl2/sdl2-mixer.h" #include #include @@ -68,14 +67,6 @@ void OSystem_PS3::initBackend() { if (_savefileManager == 0) _savefileManager = new DefaultSaveFileManager(PREFIX "/saves"); - // Create the mixer manager - if (_mixer == 0) { - _mixerManager = new Sdl2MixerManager(); - - // Setup and start mixer - _mixerManager->init(); - } - // Event source if (_eventSource == 0) _eventSource = new PS3SdlEventSource(); -- cgit v1.2.3