Formatting cleaning

[vlc] / modules / audio_output / file.c

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index ac30c75b28d3b1da3f74145e718572aa68fdd1b9..d062c29d4f9d8a622e91bcf9a3fb686bf1071da7 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -27,7 +27,12 @@
  *****************************************************************************/
 #include <errno.h>
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_codecs.h> /* WAVEHEADER */
 #include <vlc_charset.h>
@@ -44,7 +49,7 @@
 struct aout_sys_t
 {
     FILE     * p_file;
-    vlc_bool_t b_add_wav_header;
+    bool b_add_wav_header;
 
     WAVEHEADER waveh;                      /* Wave header of the output file */
 };
@@ -110,14 +115,14 @@ vlc_module_begin();
     set_subcategory( SUBCAT_AUDIO_AOUT );
 
     add_string( "audiofile-format", "s16", NULL,
-                FORMAT_TEXT, FORMAT_LONGTEXT, VLC_TRUE );
+                FORMAT_TEXT, FORMAT_LONGTEXT, true );
         change_string_list( format_list, 0, 0 );
     add_integer( "audiofile-channels", 0, NULL,
-                 CHANNELS_TEXT, CHANNELS_LONGTEXT, VLC_TRUE );
+                 CHANNELS_TEXT, CHANNELS_LONGTEXT, true );
     add_file( "audiofile-file", "audiofile.wav", NULL, FILE_TEXT,
-              FILE_LONGTEXT, VLC_FALSE );
+              FILE_LONGTEXT, false );
         change_unsafe();
-    add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, VLC_TRUE );
+    add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, true );
 
     set_capability( "audio output", 0 );
     add_shortcut( "file" );
@@ -142,7 +147,7 @@ static int Open( vlc_object_t * p_this )
     if( !psz_name || !*psz_name )
     {
         msg_Err( p_aout, "you need to specify an output file name" );
-        if( psz_name ) free( psz_name );
+        free( psz_name );
         return VLC_EGENERIC;
     }