X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fsdl.c;h=7dc215f1e4d4cb23a159d5fde676d6d7fd2335b6;hb=da12022b26ca3f95c4038ceb73926603c27b8f1e;hp=71a0f22438eab31388c02e593adfe01d28d76a99;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc

diff --git a/modules/audio_output/sdl.c b/modules/audio_output/sdl.c
index 71a0f22438..7dc215f1e4 100644
--- a/modules/audio_output/sdl.c
+++ b/modules/audio_output/sdl.c
@@ -33,7 +33,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_aout.h>
 
 #include SDL_INCLUDE_FILE
@@ -58,14 +59,14 @@ struct aout_sys_t
 static int  Open        ( vlc_object_t * );
 static void Close       ( vlc_object_t * );
 static void Play        ( aout_instance_t * );
-static void SDLCallback ( void *, byte_t *, int );
+static void SDLCallback ( void *, uint8_t *, int );
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
     set_shortname( "SDL" );
-    set_description( _("Simple DirectMedia Layer audio output") );
+    set_description( N_("Simple DirectMedia Layer audio output") );
     set_capability( "audio output", 40 );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AOUT );
@@ -246,7 +247,7 @@ static void Close ( vlc_object_t *p_this )
 /*****************************************************************************
  * SDLCallback: what to do once SDL has played sound samples
  *****************************************************************************/
-static void SDLCallback( void * _p_aout, byte_t * p_stream, int i_len )
+static void SDLCallback( void * _p_aout, uint8_t * p_stream, int i_len )
 {
     aout_instance_t * p_aout = (aout_instance_t *)_p_aout;
     aout_buffer_t *   p_buffer;
@@ -261,12 +262,12 @@ static void SDLCallback( void * _p_aout, byte_t * p_stream, int i_len )
 
     if ( p_buffer != NULL )
     {
-        p_aout->p_libvlc->pf_memcpy( p_stream, p_buffer->p_buffer, i_len );
+        vlc_memcpy( p_stream, p_buffer->p_buffer, i_len );
         aout_BufferFree( p_buffer );
     }
     else
     {
-        p_aout->p_libvlc->pf_memset( p_stream, 0, i_len );
+        vlc_memset( p_stream, 0, i_len );
     }
 }