diff options
author | Johannes Schickel | 2015-01-25 01:34:57 +0100 |
---|---|---|
committer | Johannes Schickel | 2015-01-25 20:23:25 +0100 |
commit | 8530997fff7b5b9d558f7dd6a0d07c236e4de16f (patch) | |
tree | 3ded3cc11bae7b50138f35be7626cdae9c400af2 /backends/mixer | |
parent | defe71792dfc0ab4bcb14a64a9fc8eab9a638e69 (diff) | |
download | scummvm-rg350-8530997fff7b5b9d558f7dd6a0d07c236e4de16f.tar.gz scummvm-rg350-8530997fff7b5b9d558f7dd6a0d07c236e4de16f.tar.bz2 scummvm-rg350-8530997fff7b5b9d558f7dd6a0d07c236e4de16f.zip |
SDL: Add experimental support for SDL2.
This is based upon skristiansson's change set to make ScummVM work with SDL2.
Diffstat (limited to 'backends/mixer')
-rw-r--r-- | backends/mixer/sdl/sdl-mixer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/backends/mixer/sdl/sdl-mixer.cpp b/backends/mixer/sdl/sdl-mixer.cpp index e3b15b8c59..fa363a7ad4 100644 --- a/backends/mixer/sdl/sdl-mixer.cpp +++ b/backends/mixer/sdl/sdl-mixer.cpp @@ -57,11 +57,13 @@ void SdlMixerManager::init() { error("Could not initialize SDL: %s", SDL_GetError()); } +#if !SDL_VERSION_ATLEAST(2, 0, 0) const int maxNameLen = 20; char sdlDriverName[maxNameLen]; sdlDriverName[0] = '\0'; SDL_AudioDriverName(sdlDriverName, maxNameLen); debug(1, "Using SDL Audio Driver \"%s\"", sdlDriverName); +#endif // Get the desired audio specs SDL_AudioSpec desired = getAudioSpec(SAMPLES_PER_SEC); |