Removed unused options in the aout.

diff --git a/src/libvlc.h b/src/libvlc.h
index bed3c6e0e83150142f3fdcec4f39e968036f9c2d..f6028bce20a492c71427c547e2208536ff8f4c65 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -2,7 +2,7 @@
  * libvlc.h: main libvlc header
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.h,v 1.33 2003/01/07 13:26:22 sam Exp $
+ * $Id: libvlc.h,v 1.34 2003/01/07 14:38:13 massiot Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -80,29 +80,11 @@
     "You can set the default audio output volume here, in a range from 0 to " \
     "1024.")
 
-#define FORMAT_TEXT N_("audio output format")
-#define FORMAT_LONGTEXT N_( \
-    "You can force the audio output format here.\n" \
-    "0 -> 16 bits signed native endian (default)\n" \
-    "1 ->  8 bits unsigned\n"                       \
-    "2 -> 16 bits signed little endian\n"           \
-    "3 -> 16 bits signed big endian\n"              \
-    "4 ->  8 bits signed\n"                         \
-    "5 -> 16 bits unsigned little endian\n"         \
-    "6 -> 16 bits unsigned big endian\n"            \
-    "7 -> MPEG2 audio (unsupported)\n"              \
-    "8 -> A52 pass-through")
-
 #define AOUT_RATE_TEXT N_("audio output frequency (Hz)")
 #define AOUT_RATE_LONGTEXT N_( \
     "You can force the audio output frequency here. Common values are " \
     "48000, 44100, 32000, 22050, 16000, 11025, 8000.")
 
-#define AOUT_CHANNELS_TEXT N_("number of channels of audio output")
-#define AOUT_CHANNELS_LONGTEXT N_( \
-    "Mono is 1, stereo is 2. Higher value (used for 5.1) may not be " \
-    "supported by your audio output module.")
-
 #define DESYNC_TEXT N_("compensate desynchronization of audio (in ms)")
 #define DESYNC_LONGTEXT N_( \
     "This option allows you to delay the audio output. This can be handy if " \
@@ -434,10 +416,7 @@ vlc_module_begin();
     add_bool( "audio", 1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT );
     add_integer_with_range( "volume", 256, 0, 1024, NULL, VOLUME_TEXT, VOLUME_LONGTEXT );
     add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT, AOUT_RATE_LONGTEXT );
-    add_integer( "aout-channels", -1, NULL,
-                 AOUT_CHANNELS_TEXT, AOUT_CHANNELS_LONGTEXT );
     add_integer( "desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT );
-    add_integer( "audio-format", 0, NULL, FORMAT_TEXT, FORMAT_LONGTEXT );
     add_bool( "headphone", 0, NULL, HEADPHONE_TEXT, HEADPHONE_LONGTEXT );
     add_integer( "headphone-dim", 5, NULL, HEADPHONE_DIM_TEXT,
                  HEADPHONE_DIM_LONGTEXT );