Commit 33fbd253 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

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 ;-)
parent 1ecc6bef
...@@ -63,6 +63,7 @@ vlc_module_begin () ...@@ -63,6 +63,7 @@ vlc_module_begin ()
add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT, add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT,
CACHING_LONGTEXT, true ) CACHING_LONGTEXT, true )
change_safe() change_safe()
add_obsolete_integer( "server-port" ) /* since 1.2.0 */
set_capability( "access", 0 ) set_capability( "access", 0 )
add_shortcut( "udp", "udpstream", "udp4", "udp6" ) add_shortcut( "udp", "udpstream", "udp4", "udp6" )
...@@ -86,7 +87,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -86,7 +87,7 @@ static int Open( vlc_object_t *p_this )
char *psz_name = strdup( p_access->psz_location ); char *psz_name = strdup( p_access->psz_location );
char *psz_parser; char *psz_parser;
const char *psz_server_addr, *psz_bind_addr = ""; 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 fam = AF_UNSPEC;
int fd; int fd;
...@@ -108,8 +109,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -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 : /* Parse psz_name syntax :
* [serveraddr[:serverport]][@[bindaddr]:[bindport]] */ * [serveraddr[:serverport]][@[bindaddr]:[bindport]] */
psz_parser = strchr( psz_name, '@' ); psz_parser = strchr( psz_name, '@' );
......
...@@ -651,10 +651,6 @@ static const int pi_clock_values[] = { -1, 0, 1 }; ...@@ -651,10 +651,6 @@ static const int pi_clock_values[] = { -1, 0, 1 };
static const char *const ppsz_clock_descriptions[] = static const char *const ppsz_clock_descriptions[] =
{ N_("Default"), N_("Disable"), N_("Enable") }; { 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_TEXT N_("MTU of the network interface")
#define MTU_LONGTEXT N_( \ #define MTU_LONGTEXT N_( \
"This is the maximum application-layer packet size that can be " \ "This is the maximum application-layer packet size that can be " \
...@@ -1879,8 +1875,6 @@ vlc_module_begin () ...@@ -1879,8 +1875,6 @@ vlc_module_begin ()
set_section( N_( "Network settings" ), NULL ) 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_integer( "mtu", MTU_DEFAULT, MTU_TEXT, MTU_LONGTEXT, true )
add_obsolete_bool( "ipv6" ) /* since 1.2.0 */ add_obsolete_bool( "ipv6" ) /* since 1.2.0 */
add_obsolete_bool( "ipv4" ) /* since 1.2.0 */ add_obsolete_bool( "ipv4" ) /* since 1.2.0 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment