diff options
| author | Bastien Bouclet | 2014-06-27 16:45:58 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2015-12-15 20:10:19 +0100 |
| commit | b9a107499911873a0f5e5452d292f6541f0f001a (patch) | |
| tree | 2236e84a6afa3908bf4d2d1dec657b5a81222085 /backends/platform | |
| parent | d80c39bb29638bed4bff6453502878eaa5afbbf9 (diff) | |
| download | scummvm-rg350-b9a107499911873a0f5e5452d292f6541f0f001a.tar.gz scummvm-rg350-b9a107499911873a0f5e5452d292f6541f0f001a.tar.bz2 scummvm-rg350-b9a107499911873a0f5e5452d292f6541f0f001a.zip | |
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.
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/sdl/ps3/ps3.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
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 <dirent.h> #include <sys/stat.h> @@ -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(); diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 6d4dede212..fffb9d56d9 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -36,8 +36,8 @@ #include "backends/saves/default/default-saves.h" -// Audio CD support was removed with SDL 1.3 -#if SDL_VERSION_ATLEAST(1, 3, 0) +// Audio CD support was removed with SDL 2.0 +#if SDL_VERSION_ATLEAST(2, 0, 0) #include "backends/audiocd/default/default-audiocd.h" #else #include "backends/audiocd/sdl/sdl-audiocd.h" @@ -246,8 +246,8 @@ void OSystem_SDL::initBackend() { #endif if (_audiocdManager == 0) { - // Audio CD support was removed with SDL 1.3 -#if SDL_VERSION_ATLEAST(1, 3, 0) + // Audio CD support was removed with SDL 2.0 +#if SDL_VERSION_ATLEAST(2, 0, 0) _audiocdManager = new DefaultAudioCDManager(); #else _audiocdManager = new SdlAudioCDManager(); |