Skip to content

V
vlc-1.1
Commit 87bbbc45 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

Remove access-filter timeshift from OSX open dialog.

parent ee08622b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 538 additions and 234 deletions
extras/package/macosx/Resources/English.lproj/Open.nib/info.nib
View file @ 87bbbc45
...@@ -2,27 +2,14 @@ ...@@ -2,27 +2,14 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key>
<string>171 127 356 240 0 0 1280 778 </string>
<key>IBEditorPositions</key>
<dict>
<key>2297</key>
<string>366 400 548 264 0 0 1280 778 </string>
<key>2301</key>
<string>366 417 548 264 0 0 1280 778 </string>
<key>2304</key>
<string>366 380 547 264 0 0 1280 778 </string>
<key>2346</key>
<string>366 400 548 264 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>489.0</string> <string>677</string>
<key>IBOldestOS</key> <key>IBOldestOS</key>
<integer>5</integer> <integer>5</integer>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>636</integer>
<integer>2346</integer> <integer>2346</integer>
<integer>683</integer>
<integer>2297</integer> <integer>2297</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
......
modules/gui/macosx/open.h
View file @ 87bbbc45
...@@ -76,7 +76,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -76,7 +76,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet id o_net_udpm_port_stp; IBOutlet id o_net_udpm_port_stp;
IBOutlet id o_net_http_url; IBOutlet id o_net_http_url;
IBOutlet id o_net_http_url_lbl; IBOutlet id o_net_http_url_lbl;
IBOutlet id o_net_timeshift_ckbox;
/* open subtitle file */ /* open subtitle file */
IBOutlet id o_file_sub_ckbox; IBOutlet id o_file_sub_ckbox;
......
modules/gui/macosx/open.m
View file @ 87bbbc45
...@@ -193,7 +193,6 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -193,7 +193,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
[[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/RTSP")]; [[o_net_mode cellAtRow:2 column:0] setTitle: _NS("HTTP/FTP/MMS/RTSP")];
[o_net_timeshift_ckbox setTitle: _NS("Allow timeshifting")];
[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" )];
...@@ -401,11 +400,6 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -401,11 +400,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
[[(VLCOutput *)o_sout_options getMRL] objectAtIndex: i]]]; [[(VLCOutput *)o_sout_options getMRL] objectAtIndex: i]]];
} }
} }
if( [o_net_timeshift_ckbox state] == NSOnState )
{
[o_options addObject: [NSString stringWithString:
@"access-filter=timeshift"]];
}
if( [[[o_tabview selectedTabViewItem] label] isEqualToString: _NS("Capture")] ) if( [[[o_tabview selectedTabViewItem] label] isEqualToString: _NS("Capture")] )
{ {
if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] ) if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] )
......
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