diff options
Diffstat (limited to 'backends/mixer')
| -rw-r--r-- | backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp | 4 | ||||
| -rw-r--r-- | backends/mixer/sdl/sdl-mixer.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp b/backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp index d59b0ebdfc..e5f63dc908 100644 --- a/backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp +++ b/backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp @@ -53,7 +53,11 @@ void DoubleBufferSDLMixerManager::startAudio() { _soundThreadIsRunning = true; // Finally start the thread +#if SDL_VERSION_ATLEAST(2, 0, 0) + _soundThread = SDL_CreateThread(mixerProducerThreadEntry, "ScummVM Double Buffer Mixer", this); +#else _soundThread = SDL_CreateThread(mixerProducerThreadEntry, this); +#endif SdlMixerManager::startAudio(); } diff --git a/backends/mixer/sdl/sdl-mixer.cpp b/backends/mixer/sdl/sdl-mixer.cpp index e3b15b8c59..dc0c853808 100644 --- a/backends/mixer/sdl/sdl-mixer.cpp +++ b/backends/mixer/sdl/sdl-mixer.cpp @@ -57,10 +57,14 @@ void SdlMixerManager::init() { error("Could not initialize SDL: %s", SDL_GetError()); } +#if SDL_VERSION_ATLEAST(2, 0, 0) + const char *sdlDriverName = SDL_GetCurrentAudioDriver(); +#else const int maxNameLen = 20; char sdlDriverName[maxNameLen]; sdlDriverName[0] = '\0'; SDL_AudioDriverName(sdlDriverName, maxNameLen); +#endif debug(1, "Using SDL Audio Driver \"%s\"", sdlDriverName); // Get the desired audio specs |