* Fixed a total breakage of decoder plugins introduced by fast_memcpy.

[vlc] / plugins / sdl / aout_sdl.c

diff --git a/plugins/sdl/aout_sdl.c b/plugins/sdl/aout_sdl.c
index 0431be21e6c1df878ddcf6fe3937f4f56e729442..4f35c0558ee89d58b94738831131f84b792e5b9d 100644 (file)
--- a/plugins/sdl/aout_sdl.c
+++ b/plugins/sdl/aout_sdl.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * aout_sdl.c : audio sdl functions library
  *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- * $Id: aout_sdl.c,v 1.12 2001/04/28 03:36:25 sam Exp $
+ * Copyright (C) 1999-2001 VideoLAN
+ * $Id: aout_sdl.c,v 1.20 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -38,20 +38,18 @@
 #include <stdio.h>                                           /* "intf_msg.h" */
 #include <stdlib.h>                            /* calloc(), malloc(), free() */
 
-#include <SDL/SDL.h>                                     /* SDL base include */
+#include SDL_INCLUDE_FILE
 
-#include "config.h"
 #include "common.h"                                     /* boolean_t, byte_t */
+#include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
 #include "threads.h"
 #include "mtime.h"
 #include "tests.h"
 
 #include "audio_output.h"                                   /* aout_thread_t */
 
-#include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
-#include "main.h"
-
 #include "modules.h"
+#include "modules_export.h"
 
 /*****************************************************************************
  * aout_sys_t: dsp audio output method descriptor
@@ -107,6 +105,7 @@ void _M( aout_getfunctions )( function_list_t * p_function_list )
  *****************************************************************************/
 static int aout_Probe( probedata_t *p_data )
 {
+#if 0
     SDL_AudioSpec desired, obtained;
 
     /* Start AudioSDL */
@@ -134,6 +133,7 @@ static int aout_Probe( probedata_t *p_data )
     /* Otherwise, there are good chances we can use this plugin, return 100. */
     intf_DbgMsg( "aout: SDL_OpenAudio successfully run" );
     SDL_CloseAudio();
+#endif
 
     if( TestMethod( AOUT_METHOD_VAR, "sdl" ) )
     {
@@ -236,6 +236,8 @@ static int aout_SetFormat( aout_thread_t *p_aout )
     p_aout->p_sys->b_active = 1;
     SDL_PauseAudio( 0 );
 
+    p_aout->i_latency = 0;
+    
     return( 0 );
 }