Removes trailing spaces. Removes tabs.

[vlc] / src / libvlc-module.c

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 8a7f98a6ad67c63d9aaecbe8c01d8a290841485f..cdf42aaaed13cfded76dfdc90444bab78c0ec072 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -40,7 +40,7 @@
 #if defined (WIN32) || defined (__APPLE__)
 static const char *ppsz_language[] =
 { "auto", "ar", "en", "en_GB", "ca", "cs", "da", "de", "es", "fa"  "fr", "gl",
-    "he", "hu", "it", "ja", "ka", "ko", "ms", "nl", "oc", "pl", "pt_BR", "ro", 
+    "he", "hu", "it", "ja", "ka", "ko", "ms", "nl", "oc", "pl", "pt_BR", "ro",
     "ru", "sk", "sl", "sv", "tr", "zh_CN", "zh_TW" };
 
 static const char *ppsz_language_text[] =
@@ -48,7 +48,7 @@ static const char *ppsz_language_text[] =
 N_("Catalan"), N_("Czech"), N_("Danish"), N_("German"), N_("Spanish"),
 N_("Persian"), N_("French"), N_("Galician"), N_("Hebrew"), N_("Hungarian"),
 N_("Italian"), N_("Japanese"),N_("Georgian"), N_("Korean"), N_("Malay"),
-N_("Dutch"), N_("Occitan"), N_("Polish"), N_("Brazilian Portuguese"), 
+N_("Dutch"), N_("Occitan"), N_("Polish"), N_("Brazilian Portuguese"),
 N_("Romanian"), N_("Russian"), N_("Slovak"), N_("Slovenian"), N_("Swedish"),
 N_("Turkish"), N_("Simplified Chinese"), N_("Chinese Traditional") };
 #endif
@@ -475,8 +475,10 @@ static const char *ppsz_clock_descriptions[] =
 
 #define MTU_TEXT N_("MTU of the network interface")
 #define MTU_LONGTEXT N_( \
-    "This is the maximum packet size that can be transmitted " \
-    "over the network interface. On Ethernet it is usually 1500 bytes.")
+    "This is the maximum application-layer packet size that can be " \
+    "transmitted over the network (in bytes).")
+/* Should be less than 1500 - 8[ppp] - 40[ip6] - 8[udp] in any case. */
+#define MTU_DEFAULT 1400
 
 #define TTL_TEXT N_("Hop limit (TTL)")
 #define TTL_LONGTEXT N_( \
@@ -1438,8 +1440,8 @@ vlc_module_begin();
     set_subcategory( SUBCAT_VIDEO_VFILTER );
     add_module_list_cat( "video-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
                 VIDEO_FILTER_TEXT, VIDEO_FILTER_LONGTEXT, VLC_FALSE );
-       add_deprecated( "filter", VLC_FALSE ); /*deprecated since 0.8.2 */
-//       add_deprecated( "vout-filter", VLC_FALSE ); /* deprecated since 0.8.6 *// While the "video-filter" chain isn't parsed for both vfilter and vfilter2, keep both options
+       add_deprecated_alias( "filter" ); /*deprecated since 0.8.2 */
+//       add_deprecated_alias( "vout-filter" ); /* deprecated since 0.8.6 *// While the "video-filter" chain isn't parsed for both vfilter and vfilter2, keep both options
     add_module_list_cat( "vout-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
                         NULL, NULL, VLC_FALSE );
 #if 0
@@ -1472,7 +1474,7 @@ vlc_module_begin();
                  SUB_PATH_TEXT, SUB_PATH_LONGTEXT, VLC_TRUE );
     add_integer( "sub-margin", 0, NULL, SUB_MARGIN_TEXT,
                  SUB_MARGIN_LONGTEXT, VLC_TRUE );
-        add_deprecated( "spu-margin", VLC_FALSE ); /*Deprecated since 0.8.2 */
+        add_deprecated_alias( "spu-margin" ); /*Deprecated since 0.8.2 */
     set_section( N_( "Overlays" ) , NULL );
     add_module_list_cat( "sub-filter", SUBCAT_VIDEO_SUBPIC, NULL, NULL,
                 SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, VLC_FALSE );
@@ -1490,10 +1492,10 @@ vlc_module_begin();
                 INPUT_PROGRAMS_TEXT, INPUT_PROGRAMS_LONGTEXT, VLC_TRUE );
     add_integer( "audio-track", -1, NULL,
                  INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, VLC_TRUE );
-       add_deprecated( "audio-channel", VLC_FALSE ); /*deprecated since 0.8.2 */
+       add_deprecated_alias( "audio-channel" ); /*deprecated since 0.8.2 */
     add_integer( "sub-track", -1, NULL,
                  INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, VLC_TRUE );
-       add_deprecated("spu-channel",VLC_FALSE); /*deprecated since 0.8.2*/
+       add_deprecated_alias("spu-channel" ); /*deprecated since 0.8.2*/
     add_string( "audio-language", "", NULL,
                  INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_LONGTEXT,
                   VLC_FALSE );
@@ -1535,7 +1537,7 @@ vlc_module_begin();
 
     add_integer( "server-port", 1234, NULL,
                  SERVER_PORT_TEXT, SERVER_PORT_LONGTEXT, VLC_FALSE );
-    add_integer( "mtu", 1500, NULL, MTU_TEXT, MTU_LONGTEXT, VLC_TRUE );
+    add_integer( "mtu", MTU_DEFAULT, NULL, MTU_TEXT, MTU_LONGTEXT, VLC_TRUE );
     add_bool( "ipv6", 0, NULL, IPV6_TEXT, IPV6_LONGTEXT, VLC_FALSE );
         change_short('6');
     add_bool( "ipv4", 0, NULL, IPV4_TEXT, IPV4_LONGTEXT, VLC_FALSE );
@@ -2062,7 +2064,7 @@ vlc_module_begin();
 
     add_key( "key-toggle-fullscreen", KEY_TOGGLE_FULLSCREEN, NULL, TOGGLE_FULLSCREEN_KEY_TEXT,
              TOGGLE_FULLSCREEN_KEY_LONGTEXT, VLC_FALSE );
-       add_deprecated( "key-fullscreen", VLC_FALSE ); /*deprecated since 0.9.0 */
+       add_deprecated_alias( "key-fullscreen" ); /*deprecated since 0.9.0 */
     add_key( "key-leave-fullscreen", KEY_LEAVE_FULLSCREEN, NULL, LEAVE_FULLSCREEN_KEY_TEXT,
              LEAVE_FULLSCREEN_KEY_LONGTEXT, VLC_FALSE );
     add_key( "key-play-pause", KEY_PLAY_PAUSE, NULL, PLAY_PAUSE_KEY_TEXT,