Use var_Inherit* instead of var_CreateGet*.

[vlc] / modules / audio_output / sdl.c

diff --git a/modules/audio_output/sdl.c b/modules/audio_output/sdl.c
index f6266a981e22a2ce441b413a597eaa8c5c24a58b..89bbfb1eb0d24dffa666f92b0849c89e5d75b464 100644 (file)
--- 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/SDL.h>
+#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,7 +105,7 @@ static int Open ( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    if( var_Get( p_aout, "audio-device" ) != VLC_ENOVAR )
+    if( var_Get( p_aout, "audio-device", &val ) != VLC_ENOVAR )
     {
         /* The user has selected an audio device. */
         if ( val.i_int == AOUT_VAR_STEREO )