X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fsdl.c;h=89bbfb1eb0d24dffa666f92b0849c89e5d75b464;hb=fe0d096ffdccd927eb910bcc0052940059ac46f2;hp=f8425fadb948574d1eeb4facb8cc97de49cc2585;hpb=66bd92014e5d721d8fe74bfd69f601bfd228012a;p=vlc

diff --git a/modules/audio_output/sdl.c b/modules/audio_output/sdl.c
index f8425fadb9..89bbfb1eb0 100644
--- a/modules/audio_output/sdl.c
+++ b/modules/audio_output/sdl.c
@@ -37,7 +37,7 @@
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 
-#include SDL_INCLUDE_FILE
+#include <SDL.h>
 
 #define FRAME_SIZE 2048
 
@@ -91,10 +91,7 @@ static int Open ( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-#ifndef WIN32
-    /* Win32 SDL implementation doesn't support SDL_INIT_EVENTTHREAD yet */
     i_flags |= SDL_INIT_EVENTTHREAD;
-#endif
 #ifndef NDEBUG
     /* In debug mode you may want vlc to dump a core instead of staying
      * stuck */
@@ -108,11 +105,9 @@ static int Open ( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    if ( var_Type( p_aout, "audio-device" ) != 0 )
+    if( var_Get( p_aout, "audio-device", &val ) != VLC_ENOVAR )
     {
         /* The user has selected an audio device. */
-        vlc_value_t val;
-        var_Get( p_aout, "audio-device", &val );
         if ( val.i_int == AOUT_VAR_STEREO )
         {
             p_aout->output.output.i_physical_channels