From: Rémi Denis-Courmont <remi@remlab.net>
Date: Tue, 2 Aug 2011 15:07:53 +0000 (+0300)
Subject: Remove server-port and mark it obsolete
X-Git-Tag: 1.2.0-pre1~1505
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=33fbd25396faaa21eb8a80d907fcd3a002c7f4f0;p=vlc

Remove server-port and mark it obsolete

If a non-default UDP multicast destination port is used, it can and
should be specified through the MRL. Anyway, you should not use raw UDP
streaming ;-)
---

diff --git a/modules/access/udp.c b/modules/access/udp.c
index db691d14f5..9f922ed06e 100644
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -63,6 +63,7 @@ vlc_module_begin ()
     add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT,
                  CACHING_LONGTEXT, true )
         change_safe()
+    add_obsolete_integer( "server-port" ) /* since 1.2.0 */
 
     set_capability( "access", 0 )
     add_shortcut( "udp", "udpstream", "udp4", "udp6" )
@@ -86,7 +87,7 @@ static int Open( vlc_object_t *p_this )
     char *psz_name = strdup( p_access->psz_location );
     char *psz_parser;
     const char *psz_server_addr, *psz_bind_addr = "";
-    int  i_bind_port, i_server_port = 0;
+    int  i_bind_port = 1234, i_server_port = 0;
     int fam = AF_UNSPEC;
     int fd;
 
@@ -108,8 +109,6 @@ static int Open( vlc_object_t *p_this )
         }
     }
 
-    i_bind_port = var_InheritInteger( p_access, "server-port" );
-
     /* Parse psz_name syntax :
      * [serveraddr[:serverport]][@[bindaddr]:[bindport]] */
     psz_parser = strchr( psz_name, '@' );
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 08686cb8e3..a1f109e113 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -651,10 +651,6 @@ static const int pi_clock_values[] = { -1, 0, 1 };
 static const char *const ppsz_clock_descriptions[] =
 { N_("Default"), N_("Disable"), N_("Enable") };
 
-#define SERVER_PORT_TEXT N_("UDP port")
-#define SERVER_PORT_LONGTEXT N_( \
-    "This is the default port used for UDP streams. Default is 1234." )
-
 #define MTU_TEXT N_("MTU of the network interface")
 #define MTU_LONGTEXT N_( \
     "This is the maximum application-layer packet size that can be " \
@@ -1879,8 +1875,6 @@ vlc_module_begin ()
 
     set_section( N_( "Network settings" ), NULL )
 
-    add_integer( "server-port", 1234,
-                 SERVER_PORT_TEXT, SERVER_PORT_LONGTEXT, false )
     add_integer( "mtu", MTU_DEFAULT, MTU_TEXT, MTU_LONGTEXT, true )
     add_obsolete_bool( "ipv6" ) /* since 1.2.0 */
     add_obsolete_bool( "ipv4" ) /* since 1.2.0 */