Commit 28f202e8 authored by Benjamin Pracht's avatar Benjamin Pracht

Add rtsp to the list of protocols available in the http/ftp/mms option of the...

Add rtsp to the list of protocols available in the http/ftp/mms option of the open network dialog. This breaks translation of this string but, BTW, why is it translatable ?

parent f324c82b
...@@ -164,7 +164,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) ...@@ -164,7 +164,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
[[o_net_mode cellAtRow:0 column:0] setTitle: _NS("UDP/RTP")]; [[o_net_mode cellAtRow:0 column:0] setTitle: _NS("UDP/RTP")];
[[o_net_mode cellAtRow:1 column:0] setTitle: _NS("UDP/RTP Multicast")]; [[o_net_mode cellAtRow:1 column:0] setTitle: _NS("UDP/RTP Multicast")];
[[o_net_mode cellAtRow:2 column:0] setTitle: _NS("HTTP/FTP/MMS")]; [[o_net_mode cellAtRow:2 column:0] setTitle: _NS("HTTP/FTP/MMS/RTSP")];
[o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )]; [o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )];
[o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )]; [o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )];
...@@ -629,7 +629,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) ...@@ -629,7 +629,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
if( [o_mode isEqualToString: _NS("UDP/RTP")] ) b_udp = TRUE; if( [o_mode isEqualToString: _NS("UDP/RTP")] ) b_udp = TRUE;
else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] ) b_udpm = TRUE; else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] ) b_udpm = TRUE;
else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] ) b_http = TRUE; else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS/RTSP")] ) b_http = TRUE;
[o_net_udp_port setEnabled: b_udp]; [o_net_udp_port setEnabled: b_udp];
[o_net_udp_port_stp setEnabled: b_udp]; [o_net_udp_port_stp setEnabled: b_udp];
...@@ -690,12 +690,12 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) ...@@ -690,12 +690,12 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
[o_mrl_string stringByAppendingFormat: @":%i", i_port]; [o_mrl_string stringByAppendingFormat: @":%i", i_port];
} }
} }
else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] ) else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS/RTSP")] )
{ {
NSString *o_url = [o_net_http_url stringValue]; NSString *o_url = [o_net_http_url stringValue];
if ( ![o_url hasPrefix:@"http:"] && ![o_url hasPrefix:@"ftp:"] if ( ![o_url hasPrefix:@"http:"] && ![o_url hasPrefix:@"ftp:"]
&& ![o_url hasPrefix:@"mms"] ) && ![o_url hasPrefix:@"mms"] && ![o_url hasPrefix:@"rtsp"] )
o_mrl_string = [NSString stringWithFormat: @"http://%@", o_url]; o_mrl_string = [NSString stringWithFormat: @"http://%@", o_url];
else else
o_mrl_string = o_url; o_mrl_string = o_url;
......
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