[Scummvm-cvs-logs] scummvm master -> 07623530f328f7eabf29dc76484504093ff7fd94

[somaen]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
07623530f3 SDL: Special case the call to SDL_CreateThread for SDL2, since SDL2 requires threads to be named.


Commit: 07623530f328f7eabf29dc76484504093ff7fd94
    https://github.com/scummvm/scummvm/commit/07623530f328f7eabf29dc76484504093ff7fd94
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2015-03-06T02:27:48+01:00

Commit Message:
SDL: Special case the call to SDL_CreateThread for SDL2, since SDL2 requires threads to be named.

- Fixes compilation on OS X with SDL2 enabled, SDL1 builds should be entirely unaffected.

Changed paths:
    backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp



diff --git a/backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp b/backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp
index d59b0eb..e5f63dc 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();
 }