DirectSound: cosmetics

[vlc] / modules / audio_output / file.c

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index 366fe825fad68b651c2ef5e42a2af38c255c50fe..358cab3a39d4e02b540a46812062fcbe846a3cdb 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -97,7 +97,7 @@ static const char *const format_list[] = { "u8", "s8", "u16", "s16", "u16_le",
                                      "float32", "spdif" };
 static const int format_int[] = { VLC_CODEC_U8,
                                   VLC_CODEC_S8,
-                                  AOUT_FMT_U16_NE, AOUT_FMT_S16_NE,
+                                  VLC_CODEC_U16N, VLC_CODEC_S16N,
                                   VLC_CODEC_U16L,
                                   VLC_CODEC_S16L,
                                   VLC_CODEC_U16B,
@@ -122,7 +122,7 @@ vlc_module_begin ()
                  CHANNELS_TEXT, CHANNELS_LONGTEXT, true )
     add_file( "audiofile-file", "audiofile.wav", NULL, FILE_TEXT,
               FILE_LONGTEXT, false )
-    add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, true )
+    add_bool( "audiofile-wav", true, NULL, WAV_TEXT, WAV_LONGTEXT, true )
 
     set_capability( "audio output", 0 )
     add_shortcut( "file" )
@@ -323,7 +323,7 @@ static void Play( aout_instance_t * p_aout )
 
     p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo );
 
-    if( fwrite( p_buffer->p_buffer, p_buffer->i_nb_bytes, 1,
+    if( fwrite( p_buffer->p_buffer, p_buffer->i_buffer, 1,
                 p_aout->output.p_sys->p_file ) != 1 )
     {
         msg_Err( p_aout, "write error (%m)" );
@@ -332,7 +332,7 @@ static void Play( aout_instance_t * p_aout )
     if( p_aout->output.p_sys->b_add_wav_header )
     {
         /* Update Wave Header */
-        p_aout->output.p_sys->waveh.DataLength += p_buffer->i_nb_bytes;
+        p_aout->output.p_sys->waveh.DataLength += p_buffer->i_buffer;
     }
 
     aout_BufferFree( p_buffer );