* Fixed a few warnings with gcc 3.0.

[vlc] / plugins / alsa / aout_alsa.c

diff --git a/plugins/alsa/aout_alsa.c b/plugins/alsa/aout_alsa.c
index 717a9764b6e41c9db409b33ae35d76ae15efa100..d49246940eb060d121b143025207d278f3cd0bf9 100644 (file)
--- a/plugins/alsa/aout_alsa.c
+++ b/plugins/alsa/aout_alsa.c
@@ -2,9 +2,9 @@
  * aout_alsa.c : Alsa functions library
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
+ * $Id: aout_alsa.c,v 1.14 2001/05/06 04:32:02 sam Exp $
  *
- * Authors:
- *  Henri Fallon <henri@videolan.org>
+ * Authors: Henri Fallon <henri@videolan.org>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
  *****************************************************************************/
 
 #define MODULE_NAME alsa
+#include "modules_inner.h"
 
 /*****************************************************************************
  * Preamble
@@ -35,7 +36,6 @@
 #include <stdlib.h>                            /* calloc(), malloc(), free() */
 
 #include <sys/asoundlib.h>
-#include <linux/asound.h>
 
 #include "config.h"
 #include "common.h"                                     /* boolean_t, byte_t */
@@ -49,9 +49,6 @@
 #include "main.h"
 
 #include "modules.h"
-#include "modules_inner.h"
-
-
 
 typedef struct alsa_device_s
 {
@@ -85,12 +82,11 @@ static void    aout_Play        ( aout_thread_t *p_aout,
                                           byte_t *buffer, int i_size );
 static void    aout_Close       ( aout_thread_t *p_aout );
 
-
 /*****************************************************************************
  * Functions exported as capabilities. They are declared as static so that
  * we don't pollute the namespace too much.
  *****************************************************************************/
-void aout_getfunctions( function_list_t * p_function_list )
+void _M( aout_getfunctions )( function_list_t * p_function_list )
 {
     p_function_list->pf_probe = aout_Probe;
     p_function_list->functions.aout.pf_open = aout_Open;
@@ -99,7 +95,6 @@ void aout_getfunctions( function_list_t * p_function_list )
     p_function_list->functions.aout.pf_play = aout_Play;
     p_function_list->functions.aout.pf_close = aout_Close;
 }
-    
 
 /*****************************************************************************
  * aout_Probe: probes the audio device and return a score
@@ -274,8 +269,8 @@ static int aout_SetFormat( aout_thread_t *p_aout )
        snd_pcm_playback_go( p_aout->p_sys->p_alsa_handle );
     if( i_playback_go_returns )
     {
-        intf_ErrMsg( "ALSA_PLUGIN : Unable to prepare channel (bis) : 
-                exit  = %i", i_playback_go_returns );
+        intf_ErrMsg( "ALSA_PLUGIN : Unable to prepare channel (bis) : "
+                "exit  = %i", i_playback_go_returns );
         intf_ErrMsg( "This means : %s",
                 snd_strerror( i_set_param_returns ) );
         return( -1 );