Cosmetic and initial support of sipr in rm demuxer. Doesn't work with all flavours...

[vlc] / modules / audio_output / file.c

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index 5144d36704857e8d1295b8658473d8ae4794c5fc..5ac85e353cd2b795647910ffd95d31cf4b936789 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -25,16 +25,12 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <string.h>
-#include <stdlib.h>
 #include <errno.h>
 
 #include <vlc/vlc.h>
-#include <vlc/aout.h>
-#include "charset.h"
-
-#include "aout_internal.h"
-#include "codecs.h"
+#include <vlc_aout.h>
+#include <vlc_codecs.h> /* WAVEHEADER */
+#include <vlc_charset.h>
 
 #define FRAME_SIZE 2048
 #define A52_FRAME_NB 1536
@@ -90,9 +86,9 @@ static void    Play        ( aout_instance_t * );
 #define WAV_LONGTEXT N_("Instead of writing a raw file, you can add a WAV " \
                         "header to the file.")
 
-static char *format_list[] = { "u8", "s8", "u16", "s16", "u16_le", "s16_le",
-                               "u16_be", "s16_be", "fixed32", "float32",
-                               "spdif" };
+static const char *format_list[] = { "u8", "s8", "u16", "s16", "u16_le",
+                                     "s16_le", "u16_be", "s16_be", "fixed32",
+                                     "float32", "spdif" };
 static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
                             VLC_FOURCC('s','8',' ',' '),
                             AOUT_FMT_U16_NE, AOUT_FMT_S16_NE,
@@ -108,7 +104,7 @@ static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
 #define FILE_LONGTEXT N_("File to which the audio samples will be written to.")
 
 vlc_module_begin();
-    set_description( N_("File audio output") );
+    set_description( _("File audio output") );
     set_shortname( _("File") );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AOUT );
@@ -135,7 +131,7 @@ static int Open( vlc_object_t * p_this )
 {
     aout_instance_t * p_aout = (aout_instance_t *)p_this;
     char * psz_name, * psz_format;
-    char ** ppsz_compare = format_list;
+    const char ** ppsz_compare = format_list;
     vlc_value_t val;
     int i_channels, i = 0;
 
@@ -271,7 +267,7 @@ static int Open( vlc_object_t * p_this )
         if( fwrite( wh, sizeof(WAVEHEADER), 1,
                     p_aout->output.p_sys->p_file ) != 1 )
         {
-            msg_Err( p_aout, "write error (%s)", strerror(errno) );
+            msg_Err( p_aout, "write error (%m)" );
         }
     }
 
@@ -296,7 +292,7 @@ static void Close( vlc_object_t * p_this )
         /* Write Wave Header */
         if( fseek( p_aout->output.p_sys->p_file, 0, SEEK_SET ) )
         {
-            msg_Err( p_aout, "seek error (%s)", strerror(errno) );
+            msg_Err( p_aout, "seek error (%m)" );
         }
 
         /* Header -> little endian format */
@@ -308,7 +304,7 @@ static void Close( vlc_object_t * p_this )
         if( fwrite( &p_aout->output.p_sys->waveh, sizeof(WAVEHEADER), 1,
                     p_aout->output.p_sys->p_file ) != 1 )
         {
-            msg_Err( p_aout, "write error (%s)", strerror(errno) );
+            msg_Err( p_aout, "write error (%m)" );
         }
     }
 
@@ -328,7 +324,7 @@ static void Play( aout_instance_t * p_aout )
     if( fwrite( p_buffer->p_buffer, p_buffer->i_nb_bytes, 1,
                 p_aout->output.p_sys->p_file ) != 1 )
     {
-        msg_Err( p_aout, "write error (%s)", strerror(errno) );
+        msg_Err( p_aout, "write error (%m)" );
     }
 
     if( p_aout->output.p_sys->b_add_wav_header )