Commit c0f9e01e authored by Pierre Ynard's avatar Pierre Ynard

rtsp: fix up duplicate --rtsp-host option declaration

(cherry picked from commit bc17f428edeb12407c1b46bbfb930aa401d8b1ff)
Signed-off-by: default avatarPierre Ynard <linkfanel@yahoo.fr>
parent 96e2c0eb
...@@ -164,13 +164,6 @@ static const char *const ppsz_protocols[] = { ...@@ -164,13 +164,6 @@ static const char *const ppsz_protocols[] = {
#define RFC3016_LONGTEXT N_( \ #define RFC3016_LONGTEXT N_( \
"This allows you to stream MPEG4 LATM audio streams (see RFC3016)." ) "This allows you to stream MPEG4 LATM audio streams (see RFC3016)." )
#define RTSP_HOST_TEXT N_( "RTSP host address" )
#define RTSP_HOST_LONGTEXT N_( \
"This defines the address, port and path the RTSP VOD server will listen " \
"on.\nSyntax is address:port/path. The default is to listen on all "\
"interfaces (address 0.0.0.0), on port 554, with no path.\nTo listen " \
"only on the local interface, use \"localhost\" as address." )
#define RTSP_TIMEOUT_TEXT N_( "RTSP session timeout (s)" ) #define RTSP_TIMEOUT_TEXT N_( "RTSP session timeout (s)" )
#define RTSP_TIMEOUT_LONGTEXT N_( "RTSP sessions will be closed after " \ #define RTSP_TIMEOUT_LONGTEXT N_( "RTSP sessions will be closed after " \
"not receiving any RTSP request for this long. Setting it to a " \ "not receiving any RTSP request for this long. Setting it to a " \
...@@ -255,8 +248,6 @@ vlc_module_begin () ...@@ -255,8 +248,6 @@ vlc_module_begin ()
set_capability( "vod server", 10 ) set_capability( "vod server", 10 )
set_callbacks( OpenVoD, CloseVoD ) set_callbacks( OpenVoD, CloseVoD )
add_shortcut( "rtsp" ) add_shortcut( "rtsp" )
add_string ( "rtsp-host", NULL, RTSP_HOST_TEXT,
RTSP_HOST_LONGTEXT, true )
add_integer( "rtsp-timeout", 60, RTSP_TIMEOUT_TEXT, add_integer( "rtsp-timeout", 60, RTSP_TIMEOUT_TEXT,
RTSP_TIMEOUT_LONGTEXT, true ) RTSP_TIMEOUT_LONGTEXT, true )
add_string( "sout-rtsp-user", "", add_string( "sout-rtsp-user", "",
......
...@@ -915,12 +915,19 @@ static const char *const ppsz_prefres[] = { ...@@ -915,12 +915,19 @@ static const char *const ppsz_prefres[] = {
"Default TCP connection timeout (in milliseconds). " ) "Default TCP connection timeout (in milliseconds). " )
#define HTTP_HOST_TEXT N_( "HTTP server address" ) #define HTTP_HOST_TEXT N_( "HTTP server address" )
#define RTSP_HOST_TEXT N_( "RTSP server address" )
#define HOST_LONGTEXT N_( \ #define HOST_LONGTEXT N_( \
"By default, the server will listen on any local IP address. " \ "By default, the server will listen on any local IP address. " \
"Specify an IP address (e.g. ::1 or 127.0.0.1) or a host name " \ "Specify an IP address (e.g. ::1 or 127.0.0.1) or a host name " \
"(e.g. localhost) to restrict them to a specific network interface." ) "(e.g. localhost) to restrict them to a specific network interface." )
#define RTSP_HOST_TEXT N_( "RTSP server address" )
#define RTSP_HOST_LONGTEXT N_( \
"This defines the address the RTSP server will listen on, along " \
"with the base path of the RTSP VOD media. Syntax is address/path. " \
"By default, the server will listen on any local IP address. " \
"Specify an IP address (e.g. ::1 or 127.0.0.1) or a host name " \
"(e.g. localhost) to restrict them to a specific network interface." )
#define HTTP_PORT_TEXT N_( "HTTP server port" ) #define HTTP_PORT_TEXT N_( "HTTP server port" )
#define HTTP_PORT_LONGTEXT N_( \ #define HTTP_PORT_LONGTEXT N_( \
"The HTTP server will listen on this TCP port. " \ "The HTTP server will listen on this TCP port. " \
...@@ -1876,7 +1883,7 @@ vlc_module_begin () ...@@ -1876,7 +1883,7 @@ vlc_module_begin ()
change_integer_range( 1, 65535 ) change_integer_range( 1, 65535 )
add_integer( "https-port", 8443, HTTPS_PORT_TEXT, HTTPS_PORT_LONGTEXT, true ) add_integer( "https-port", 8443, HTTPS_PORT_TEXT, HTTPS_PORT_LONGTEXT, true )
change_integer_range( 1, 65535 ) change_integer_range( 1, 65535 )
add_string( "rtsp-host", NULL, RTSP_HOST_TEXT, HOST_LONGTEXT, true ) add_string( "rtsp-host", NULL, RTSP_HOST_TEXT, RTSP_HOST_LONGTEXT, true )
add_integer( "rtsp-port", 554, RTSP_PORT_TEXT, RTSP_PORT_LONGTEXT, true ) add_integer( "rtsp-port", 554, RTSP_PORT_TEXT, RTSP_PORT_LONGTEXT, true )
change_integer_range( 1, 65535 ) change_integer_range( 1, 65535 )
add_loadfile( "http-cert", NULL, HTTP_CERT_TEXT, CERT_LONGTEXT, true ) add_loadfile( "http-cert", NULL, HTTP_CERT_TEXT, CERT_LONGTEXT, true )
......
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