reverting a whole bunch of stupid changes,

[vlc] / modules / audio_output / file.c

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index d09753acc5e2b4df0957df9738b41aa313982b41..57d964329a3cb88fcac08e3860c2ace4fa38db37 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -2,7 +2,7 @@
  * file.c : audio output which writes the samples to a file
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: file.c,v 1.14 2002/11/11 19:16:21 gbazin Exp $
+ * $Id: file.c,v 1.26 2004/01/25 17:58:29 murray Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -11,7 +11,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -79,17 +79,17 @@ static void    Play        ( aout_instance_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define FORMAT_TEXT N_("output format")
-#define FORMAT_LONGTEXT N_("one of \"u8\", \"s8\", \"u16\", \"s16\"," \
-                        " \"u16_le\", \"s16_le\", \"u16_be\"," \
-                        " \"s16_be\", \"fixed32\", \"float32\" or \"spdif\"")
-#define WAV_TEXT N_("add wave header")
-#define WAV_LONGTEXT N_("instead of writing a raw file, you can add a wav " \
+#define FORMAT_TEXT N_("Output Format")
+#define FORMAT_LONGTEXT N_("One of \"u8\", \"s8\", \"u16\", \"s16\", " \
+                        "\"u16_le\", \"s16_le\", \"u16_be\", " \
+                        "\"s16_be\", \"fixed32\", \"float32\" or \"spdif\"")
+#define WAV_TEXT N_("Add wave header")
+#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", NULL };
+                               "spdif" };
 static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
                             VLC_FOURCC('s','8',' ',' '),
                             AOUT_FMT_U16_NE, AOUT_FMT_S16_NE,
@@ -101,17 +101,18 @@ static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
                             VLC_FOURCC('f','l','3','2'),
                             VLC_FOURCC('s','p','i','f') };
 
-#define PATH_TEXT N_("path of the output file")
-#define PATH_LONGTEXT N_("By default samples.raw")
+#define FILE_TEXT N_("Output File")
+#define FILE_LONGTEXT N_("File to which the audio samples will be written to")
 
 vlc_module_begin();
-    add_category_hint( N_("Audio"), NULL );
-    add_string_from_list( "audiofile-format", "s16", format_list, NULL,
-                          FORMAT_TEXT, FORMAT_LONGTEXT );
-    add_string( "audiofile-path", "audiofile.wav", NULL, PATH_TEXT,
-                PATH_LONGTEXT );
-    add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT );
-    set_description( _("file audio output module") );
+    add_category_hint( N_("Audio"), NULL, VLC_FALSE );
+    add_string( "audiofile-format", "s16", NULL,
+                FORMAT_TEXT, FORMAT_LONGTEXT, VLC_TRUE );
+        change_string_list( format_list, 0, 0 );
+    add_file( "audiofile", "audiofile.wav", NULL, FILE_TEXT,
+              FILE_LONGTEXT, VLC_FALSE );
+    add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, VLC_TRUE );
+    set_description( N_("File audio output") );
     set_capability( "audio output", 0 );
     add_shortcut( "file" );
     add_shortcut( "audiofile" );
@@ -124,7 +125,7 @@ vlc_module_end();
 static int Open( vlc_object_t * p_this )
 {
     aout_instance_t * p_aout = (aout_instance_t *)p_this;
-    char * psz_name = config_GetPsz( p_this, "audiofile-path" );
+    char * psz_name = config_GetPsz( p_this, "audiofile" );
     char * psz_format = config_GetPsz( p_aout, "audiofile-format" );
     char ** ppsz_compare = format_list;
     int i = 0;
@@ -158,7 +159,7 @@ static int Open( vlc_object_t * p_this )
 
     if ( *ppsz_compare == NULL )
     {
-        msg_Err( p_aout, "Cannot understand the format string (%s)",
+        msg_Err( p_aout, "cannot understand the format string (%s)",
                  psz_format );
         fclose( p_aout->output.p_sys->p_file );
         free( p_aout->output.p_sys );