Changeset ffc45b9454e212908669d2370f5e5bf1da8d8c9e

Timestamp:

11/10/05 19:16:13 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1129050973 +0000

git-parent:

[9f516fa2fc9027acf50a715018b240442b779e7f]

git-author:

Clément Stenac <zorglub@videolan.org> 1129050973 +0000

Message:

Fix a bunch of preferences errors

• Missing value lists
  
• advanced / non-advanced problems
  
• description problems
  
• tyops
  

Files:

• include/vlc_config_cat.h (modified) (1 diff)
• modules/access/dshow/dshow.cpp (modified) (1 diff)
• modules/access/http.c (modified) (1 diff)
• modules/access/mms/mms.c (modified) (1 diff)
• modules/access/rtsp/access.c (modified) (1 diff)
• modules/audio_filter/channel_mixer/headphone.c (modified) (1 diff)
• modules/codec/twolame.c (modified) (3 diffs)
• modules/codec/x264.c (modified) (1 diff)
• modules/demux/avi/avi.c (modified) (2 diffs)
• modules/demux/livedotcom.cpp (modified) (1 diff)
• modules/demux/playlist/playlist.c (modified) (1 diff)
• modules/video_filter/blend.c (modified) (1 diff)
• modules/video_filter/clone.c (modified) (1 diff)
• modules/video_filter/deinterlace.c (modified) (2 diffs)
• modules/video_filter/logo.c (modified) (1 diff)
• modules/video_filter/marq.c (modified) (2 diffs)
• modules/video_filter/osdmenu.c (modified) (1 diff)
• modules/video_filter/rss.c (modified) (2 diffs)
• modules/video_filter/rv32.c (modified) (1 diff)
• modules/video_filter/time.c (modified) (1 diff)
• modules/video_filter/wall.c (modified) (1 diff)
• src/libvlc.h (modified) (12 diffs)

include/vlc_config_cat.h

@@ -98 +98 @@
-#define ACCESS_TITLE N_( "Access modules" )
-#define ACCESS_HELP N_( \
-\n
+ 
-    "Common settings you may want to alter are HTTP proxy or " \
-    "caching settings." )
-
- module
+
-#define ACCESS_FILTER_HELP N_( \
-
+
+
+
-
-#define DEMUX_TITLE N_("Demuxers")

modules/access/dshow/dshow.cpp

@@ -159 +159 @@
-
-    add_bool( "dshow-config", VLC_FALSE, NULL, CONFIG_TEXT, CONFIG_LONGTEXT,
-FALS
+TRU
-
-    add_bool( "dshow-tuner", VLC_FALSE, NULL, TUNER_TEXT, TUNER_LONGTEXT,
-FALS
+TRU
-
-    add_integer( "dshow-tuner-channel", 0, NULL, CHANNEL_TEXT,

modules/access/http.c

@@ -78 +78 @@
-                 CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
-    add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT,
-FALS
+TRU
-    add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT,
-              RECONNECT_LONGTEXT, VLC_TRUE );

modules/access/mms/mms.c

@@ -51 +51 @@
-#define ALL_TEXT N_("Force selection of all streams")
-
-"Select maximum bitrate stream"
+ "Maximum bitrate" 
-#define BITRATE_LONGTEXT N_( \
-
+
+
-
-vlc_module_begin();

modules/access/rtsp/access.c

@@ -44 +44 @@
-
-vlc_module_begin();
-Standard filesystem file input
+Real RTSP
-    set_shortname( _("Real RTSP") );
-    set_category( CAT_INPUT );

modules/audio_filter/channel_mixer/headphone.c

@@ -77 +77 @@
-
-    add_integer( "headphone-dim", 10, NULL, HEADPHONE_DIM_TEXT,
-FALS
+TRU
-    add_bool( "headphone-compensate", 0, NULL, HEADPHONE_COMPENSATE_TEXT,
-              HEADPHONE_COMPENSATE_LONGTEXT, VLC_TRUE );

modules/codec/twolame.c

@@ -54 +54 @@
-  "This will produce a VBR stream." )
-#define ENC_MODE_TEXT N_("Stereo mode")
-
-
+
-#define ENC_VBR_TEXT N_("VBR mode")
-#define ENC_VBR_LONGTEXT N_( \
@@ -62 +61 @@
-#define ENC_PSY_LONGTEXT N_( \
-  "Integer from -1 (no model) to 4." )
+
+static int pi_stereo_values[] = { 0, 1, 2 };
+static char *ppsz_stereo_descriptions[] =
+{ N_("Stereo"), N_("Dual mono"), N_("Joint stereo") };
+
-
-vlc_module_begin();
@@ -75 +79 @@
-    add_integer( ENC_CFG_PREFIX "mode", 0, NULL, ENC_MODE_TEXT,
-                 ENC_MODE_LONGTEXT, VLC_FALSE );
+        change_integer_list( pi_stereo_values, ppsz_stereo_descriptions, 0 );
-    add_bool( ENC_CFG_PREFIX "vbr", 0, NULL, ENC_VBR_TEXT,
-              ENC_VBR_LONGTEXT, VLC_FALSE );

modules/codec/x264.c

@@ -126 +126 @@
-
-vlc_module_begin();
-h264 video encoder using x264 library
+H264 encoder (using x264 library)
-    set_capability( "encoder", 200 );
-    set_callbacks( Open, Close );

modules/demux/avi/avi.c

@@ -43 +43 @@
-#define INDEX_TEXT N_("Force index creation")
-#define INDEX_LONGTEXT N_( \
-
+
+
-
-static int  Open ( vlc_object_t * );
@@ -58 +59 @@
-              INTERLEAVE_TEXT, INTERLEAVE_LONGTEXT, VLC_TRUE );
-    add_bool( "avi-index", 0, NULL,
-TRU
+FALS
-
-    set_callbacks( Open, Close );

modules/demux/livedotcom.cpp

@@ -70 +70 @@
-
-vlc_module_begin();
-live.com (RTSP/RTP/SDP) demuxer
+RTP/RTSP/SDP demuxer (using Live.com)
-    set_capability( "demux2", 50 );
-Live.com 
+
-    set_callbacks( Open, Close );
-    add_shortcut( "live" );

modules/demux/playlist/playlist.c

@@ -47 +47 @@
-
-    set_shortname( _("Playlist") );
-Old playlist open
+Playlist
-    add_shortcut( "old-open" );
-    set_capability( "demux2", 10 );

modules/video_filter/blend.c

@@ -66 +66 @@
-vlc_module_begin();
-    set_description( _("Video pictures blending") );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video blending", 100 );
-    set_callbacks( OpenFilter, CloseFilter );

modules/video_filter/clone.c

@@ -68 +68 @@
-
-    add_integer( "clone-count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, VLC_FALSE );
-FALS
+TRU
-
-    add_shortcut( "clone" );

modules/video_filter/deinterlace.c

@@ -101 +101 @@
- *****************************************************************************/
-#define MODE_TEXT N_("Deinterlace mode")
-
+
+
+
+
-
-#define FILTER_CFG_PREFIX "sout-deinterlace-"
@@ -127 +130 @@
-    set_capability( "video filter2", 0 );
-    set_section( N_("Streaming"),NULL);
-
-
+SOUT_
+SOUT_
-        change_string_list( mode_list, mode_list_text, 0 );
-    set_callbacks( OpenFilter, CloseFilter );

modules/video_filter/logo.c

@@ -96 +96 @@
-
-    add_file( "logo-file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, VLC_FALSE );
-FALS
-FALS
+TRU
+TRU
-    add_integer_with_range( "logo-transparency", 255, 0, 255, NULL,
-        TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE );
-TRU
+FALS
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
-

modules/video_filter/marq.c

@@ -116 +116 @@
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_SUBPIC );
-
+
+
-
-    set_section( N_("Position"), NULL );
-FALS
-FALS
-TRU
+TRU
+TRU
+FALS
-
-    set_section( N_("Font"), NULL );
@@ -128 +129 @@
-    add_integer_with_range( "marq-opacity", 255, 0, 255, NULL,
-        OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE );
-
+
+
-        change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
-    add_integer( "marq-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE );

modules/video_filter/osdmenu.c

@@ -117 +117 @@
-    set_shortname( N_("OSD menu") );
-    add_shortcut( "osdmenu" );
+/*
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_SUBPIC );
+*/
-    set_callbacks( CreateFilter, DestroyFilter );
-vlc_module_end();

modules/video_filter/rss.c

@@ -157 +157 @@
-
-    set_section( N_("Position"), NULL );
-
-
-
+
+
+
+
-
-    set_section( N_("Font"), NULL );
-    /* 5 sets the default to top [1] left [4] */
-    change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
-    add_integer_with_range( "rss-opacity", 255, 0, 255, NULL,
-        OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE );
-
+
+
-        change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
-    add_integer( "rss-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE );
@@ -175 +176 @@
-    add_integer( "rss-length", 60, NULL, LENGTH_TEXT, LENGTH_LONGTEXT,
-                 VLC_FALSE );
-9
-
- sub filter
+18
+
+
-    add_shortcut( "rss" );
-vlc_module_end();

modules/video_filter/rv32.c

@@ -52 +52 @@
-    set_description( _("RV32 conversion filter") );
-    set_capability( "video filter2", 1 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_callbacks( OpenFilter, CloseFilter );
-vlc_module_end();

modules/video_filter/time.c

@@ -106 +106 @@
-    set_subcategory( SUBCAT_VIDEO_SUBPIC );
-    set_callbacks( CreateFilter, DestroyFilter );
-
-
-
-
+
+
+
+
+
-    /* 9 sets the default to bottom-left, minimizing jitter */
-    change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
-    add_integer_with_range( "time-opacity", 255, 0, 255, NULL,
-        OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE );
-
+
+
-        change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
-    add_integer( "time-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE );

modules/video_filter/wall.c

@@ -75 +75 @@
-    add_integer( "wall-cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT, VLC_FALSE );
-    add_integer( "wall-rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT, VLC_FALSE );
-
+
+
-    add_string( "wall-element-aspect", "4:3", NULL, ASPECT_TEXT, ASPECT_LONGTEXT, VLC_FALSE );
-

src/libvlc.h

@@ -75 +75 @@
-    "This option turns off all warning and information messages.")
-
-Open MRL
+Default stream
-#define OPEN_LONGTEXT N_( \
-open a default MRL on start-up."
+always open a default stream on start-up." 
-
-#define LANGUAGE_TEXT N_("Language")
@@ -116 +116 @@
-#define MONO_LONGTEXT N_("This will force a mono audio output.")
-
-Audio output
+Default audio
-#define VOLUME_LONGTEXT N_( \
-    "You can set the default audio output volume here, in a range from 0 to " \
@@ -297 +297 @@
-#define SKIP_FRAMES_TEXT N_("Skip frames")
-#define SKIP_FRAMES_LONGTEXT N_( \
-
+
+
-
-#define QUIET_SYNCHRO_TEXT N_("Quiet synchro")
@@ -337 +338 @@
-    "the stream output.")
-
-Choose program (SID)
+Program to select
-#define INPUT_PROGRAM_LONGTEXT N_( \
-    "Choose the program to select by giving its Service ID.\n" \
@@ -343 +344 @@
-    "(like DVB streams for example)." )
-
-Choose programs
+Programs to select
-#define INPUT_PROGRAMS_LONGTEXT N_( \
-    "Choose the programs to select by giving a comma-separated list of " \
@@ -350 +351 @@
-    "(like DVB streams for example)." )
-
-Choose a
+A
-#define INPUT_AUDIOTRACK_LONGTEXT N_( \
-    "Give the stream number of the audio track you want to use" \
-    "(from 0 to n).")
-
-Choose s
+S
-#define INPUT_SUBTRACK_LONGTEXT N_( \
-    "Give the stream number of the subtitle track you want to use " \
-    "(from 0 to n).")
-
-Choose a
+A
-#define INPUT_AUDIOTRACK_LANG_LONGTEXT N_( \
-    "Give the language of the audio track you want to use " \
-    "(comma separted, two or tree letter country code).")
-
-Choose s
+S
-#define INPUT_SUBTRACK_LANG_LONGTEXT N_( \
-    "Give the language of the subtitle track you want to use " \
@@ -382 +383 @@
-#define INPUT_LIST_TEXT N_("Input list")
-#define INPUT_LIST_LONGTEXT N_("Allows you to specify a comma-separated list " \
-
+ after the normal one
-
-#define INPUT_SLAVE_TEXT N_("Input slave (experimental)")
-file
+stream
-    "the same time. This feature is experimental, not all formats " \
-  
+   
-
-#define BOOKMARKS_TEXT N_("Bookmarks list for a stream")
@@ -681 +682 @@
-#define ACCESS_TEXT N_("Access module")
-#define ACCESS_LONGTEXT N_( \
-
+
+
+
-
-#define ACCESS_FILTER_TEXT N_("Access filter module")
@@ -959 +962 @@
-              AOUT_RESAMP_LONGTEXT, VLC_TRUE );
-#endif
-FALS
+TRU
-    add_integer( "force-dolby-surround", 0, NULL, FORCE_DOLBY_TEXT,
-FALS
+TRU
-        change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions, 0 );
-    add_integer( "audio-desync", 0, NULL, DESYNC_TEXT,
@@ -988 +991 @@
-        change_short('f');
-    add_bool( "skip-frames", 1, NULL, SKIP_FRAMES_TEXT,
-FALS
+TRU
-    add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT,
-              QUIET_SYNCHRO_LONGTEXT, VLC_TRUE );
@@ -1088 +1091 @@
-                 INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE );
-    add_string( "programs", "", NULL,
-FALS
+TRU
-    add_integer( "audio-track", -1, NULL,
-FALS
+TRU
-       add_deprecated( "audio-channel", VLC_FALSE ); /*deprecated since 0.8.2 */
-    add_integer( "sub-track", -1, NULL,
-FALS
+TRU
-       add_deprecated("spu-channel",VLC_FALSE); /*deprecated since 0.8.2*/
-    add_string( "audio-language", "", NULL,
@@ -1102 +1105 @@
-                  VLC_FALSE );
-
-
-    set_section( N_( "Playback control" ) , NULL);
-    add_integer( "input-repeat", 0, NULL,
-TRU
+FALS
-    add_integer( "start-time", 0, NULL,
-                 START_TIME_TEXT, START_TIME_LONGTEXT, VLC_TRUE );