]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix Unix build with libSDL 2 in debug mode.
authorVadim Zeitlin <vadim@wxwidgets.org>
Fri, 21 Jun 2013 09:21:58 +0000 (09:21 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Fri, 21 Jun 2013 09:21:58 +0000 (09:21 +0000)
SDL_AudioDriverName() was replaced with SDL_GetCurrentAudioDriver() in SDL v2.

Closes #15271.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/unix/sound_sdl.cpp

index 3962e6dc722038401cca5b8ff09c1381b3673a3c..e7e847af5ccacb6506ddfd58c91b83ab9879dd87 100644 (file)
@@ -213,7 +213,11 @@ bool wxSoundBackendSDL::OpenAudio()
         {
 #if wxUSE_LOG_DEBUG
             char driver[256];
         {
 #if wxUSE_LOG_DEBUG
             char driver[256];
+#if SDL_MAJOR_VERSION == 1
             SDL_AudioDriverName(driver, 256);
             SDL_AudioDriverName(driver, 256);
+#elif SDL_MAJOR_VERSION > 1            
+            strncpy(driver, SDL_GetCurrentAudioDriver(), 256);
+#endif
             wxLogTrace(wxT("sound"), wxT("opened audio, driver '%s'"),
                        wxString(driver, wxConvLocal).c_str());
 #endif
             wxLogTrace(wxT("sound"), wxT("opened audio, driver '%s'"),
                        wxString(driver, wxConvLocal).c_str());
 #endif