diff options
| author | Johannes Schickel | 2015-12-15 23:20:22 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2015-12-15 23:20:22 +0100 |
| commit | af08ceef4a761bbce84086b7023d1ce372d2d1a3 (patch) | |
| tree | 1556dec9a9d0d2c43909c018c277defb0292a466 /backends/platform | |
| parent | d80c39bb29638bed4bff6453502878eaa5afbbf9 (diff) | |
| parent | f37fb24caa87f5cde418ac8376e7fab1a1207dae (diff) | |
| download | scummvm-rg350-af08ceef4a761bbce84086b7023d1ce372d2d1a3.tar.gz scummvm-rg350-af08ceef4a761bbce84086b7023d1ce372d2d1a3.tar.bz2 scummvm-rg350-af08ceef4a761bbce84086b7023d1ce372d2d1a3.zip | |
Merge pull request #637 from bgK/ps3-toolchain-update
PS3: Update to SDL2
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/sdl/ps3/ps3.cpp | 9 | ||||
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 8 |
2 files changed, 4 insertions, 13 deletions
diff --git a/backends/platform/sdl/ps3/ps3.cpp b/backends/platform/sdl/ps3/ps3.cpp index f111379794..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/sdl13/sdl13-mixer.h" #include <dirent.h> #include <sys/stat.h> @@ -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 Sdl13MixerManager(); - - // Setup and start mixer - _mixerManager->init(); - } - // Event source if (_eventSource == 0) _eventSource = new PS3SdlEventSource(); 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(); |