Commit 565bb4ca authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: removed settings for the former access-filters

parent c887168f
...@@ -78,7 +78,6 @@ ...@@ -78,7 +78,6 @@
"o_audio_vol_fld" = id; "o_audio_vol_fld" = id;
"o_audio_vol_sld" = id; "o_audio_vol_sld" = id;
"o_audio_vol_txt" = id; "o_audio_vol_txt" = id;
"o_currentlyShownCategoryView" = id;
"o_hotkeys_change_btn" = id; "o_hotkeys_change_btn" = id;
"o_hotkeys_change_cancel_btn" = id; "o_hotkeys_change_cancel_btn" = id;
"o_hotkeys_change_keys_lbl" = id; "o_hotkeys_change_keys_lbl" = id;
...@@ -90,15 +89,12 @@ ...@@ -90,15 +89,12 @@
"o_hotkeys_lbl" = id; "o_hotkeys_lbl" = id;
"o_hotkeys_listbox" = id; "o_hotkeys_listbox" = id;
"o_hotkeys_view" = id; "o_hotkeys_view" = id;
"o_input_access_box" = id;
"o_input_avi_pop" = id; "o_input_avi_pop" = id;
"o_input_avi_txt" = id; "o_input_avi_txt" = id;
"o_input_bandwidth_ckb" = id;
"o_input_cachelevel_custom_txt" = id; "o_input_cachelevel_custom_txt" = id;
"o_input_cachelevel_pop" = id; "o_input_cachelevel_pop" = id;
"o_input_cachelevel_txt" = id; "o_input_cachelevel_txt" = id;
"o_input_caching_box" = id; "o_input_caching_box" = id;
"o_input_dump_ckb" = id;
"o_input_httpproxy_fld" = id; "o_input_httpproxy_fld" = id;
"o_input_httpproxy_txt" = id; "o_input_httpproxy_txt" = id;
"o_input_httpproxypwd_sfld" = id; "o_input_httpproxypwd_sfld" = id;
...@@ -107,11 +103,9 @@ ...@@ -107,11 +103,9 @@
"o_input_net_box" = id; "o_input_net_box" = id;
"o_input_postproc_fld" = id; "o_input_postproc_fld" = id;
"o_input_postproc_txt" = id; "o_input_postproc_txt" = id;
"o_input_record_ckb" = id;
"o_input_rtsp_ckb" = id; "o_input_rtsp_ckb" = id;
"o_input_serverport_fld" = id; "o_input_serverport_fld" = id;
"o_input_serverport_txt" = id; "o_input_serverport_txt" = id;
"o_input_timeshift_ckb" = id;
"o_input_view" = id; "o_input_view" = id;
"o_intf_art_pop" = id; "o_intf_art_pop" = id;
"o_intf_art_txt" = id; "o_intf_art_txt" = id;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>69 71 356 240 0 0 1280 778 </string> <string>76 135 356 240 0 0 1280 778 </string>
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>2311</key> <key>2311</key>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>2523</key> <key>2523</key>
<string>345 341 590 343 0 0 1280 778 </string> <string>345 341 590 343 0 0 1280 778 </string>
<key>2562</key> <key>2562</key>
<string>345 220 590 505 0 0 1280 778 </string> <string>258 273 590 505 0 0 1280 778 </string>
<key>2668</key> <key>2668</key>
<string>345 256 590 457 0 0 1280 778 </string> <string>345 256 590 457 0 0 1280 778 </string>
</dict> </dict>
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
<integer>5</integer> <integer>5</integer>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>1530</integer>
<integer>2265</integer> <integer>2265</integer>
<integer>1530</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>9F33</string> <string>9G55</string>
<key>targetFramework</key> <key>targetFramework</key>
<string>IBCocoaFramework</string> <string>IBCocoaFramework</string>
</dict> </dict>
......
...@@ -64,15 +64,12 @@ ...@@ -64,15 +64,12 @@
IBOutlet id o_hotkeys_listbox; IBOutlet id o_hotkeys_listbox;
IBOutlet id o_hotkeys_view; IBOutlet id o_hotkeys_view;
IBOutlet id o_input_access_box;
IBOutlet id o_input_avi_pop; IBOutlet id o_input_avi_pop;
IBOutlet id o_input_avi_txt; IBOutlet id o_input_avi_txt;
IBOutlet id o_input_bandwidth_ckb;
IBOutlet id o_input_cachelevel_pop; IBOutlet id o_input_cachelevel_pop;
IBOutlet id o_input_cachelevel_txt; IBOutlet id o_input_cachelevel_txt;
IBOutlet id o_input_cachelevel_custom_txt; IBOutlet id o_input_cachelevel_custom_txt;
IBOutlet id o_input_caching_box; IBOutlet id o_input_caching_box;
IBOutlet id o_input_dump_ckb;
IBOutlet id o_input_httpproxy_fld; IBOutlet id o_input_httpproxy_fld;
IBOutlet id o_input_httpproxy_txt; IBOutlet id o_input_httpproxy_txt;
IBOutlet id o_input_httpproxypwd_sfld; IBOutlet id o_input_httpproxypwd_sfld;
...@@ -81,11 +78,9 @@ ...@@ -81,11 +78,9 @@
IBOutlet id o_input_net_box; IBOutlet id o_input_net_box;
IBOutlet id o_input_postproc_fld; IBOutlet id o_input_postproc_fld;
IBOutlet id o_input_postproc_txt; IBOutlet id o_input_postproc_txt;
IBOutlet id o_input_record_ckb;
IBOutlet id o_input_rtsp_ckb; IBOutlet id o_input_rtsp_ckb;
IBOutlet id o_input_serverport_fld; IBOutlet id o_input_serverport_fld;
IBOutlet id o_input_serverport_txt; IBOutlet id o_input_serverport_txt;
IBOutlet id o_input_timeshift_ckb;
IBOutlet id o_input_view; IBOutlet id o_input_view;
IBOutlet id o_intf_art_pop; IBOutlet id o_intf_art_pop;
......
...@@ -242,22 +242,17 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des ...@@ -242,22 +242,17 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
[[[o_hotkeys_listbox tableColumnWithIdentifier: @"shortcut"] headerCell] setStringValue: _NS("Shortcut")]; [[[o_hotkeys_listbox tableColumnWithIdentifier: @"shortcut"] headerCell] setStringValue: _NS("Shortcut")];
/* input */ /* input */
[o_input_access_box setTitle: _NS("Access Filter")];
[o_input_avi_txt setStringValue: _NS("Repair AVI Files")]; [o_input_avi_txt setStringValue: _NS("Repair AVI Files")];
[o_input_bandwidth_ckb setTitle: _NS("Bandwidth limiter")];
[o_input_cachelevel_txt setStringValue: _NS("Default Caching Level")]; [o_input_cachelevel_txt setStringValue: _NS("Default Caching Level")];
[o_input_caching_box setTitle: _NS("Caching")]; [o_input_caching_box setTitle: _NS("Caching")];
[o_input_cachelevel_custom_txt setStringValue: _NS("Use the complete preferences to configure custom caching values for each access module.")]; [o_input_cachelevel_custom_txt setStringValue: _NS("Use the complete preferences to configure custom caching values for each access module.")];
[o_input_dump_ckb setTitle: _NS("Dump")];
[o_input_httpproxy_txt setStringValue: _NS("HTTP Proxy")]; [o_input_httpproxy_txt setStringValue: _NS("HTTP Proxy")];
[o_input_httpproxypwd_txt setStringValue: _NS("Password for HTTP Proxy")]; [o_input_httpproxypwd_txt setStringValue: _NS("Password for HTTP Proxy")];
[o_input_mux_box setTitle: _NS("Codecs / Muxers")]; [o_input_mux_box setTitle: _NS("Codecs / Muxers")];
[o_input_net_box setTitle: _NS("Network")]; [o_input_net_box setTitle: _NS("Network")];
[o_input_postproc_txt setStringValue: _NS("Post-Processing Quality")]; [o_input_postproc_txt setStringValue: _NS("Post-Processing Quality")];
[o_input_record_ckb setTitle: _NS("Record")];
[o_input_rtsp_ckb setTitle: _NS("Use RTP over RTSP (TCP)")]; [o_input_rtsp_ckb setTitle: _NS("Use RTP over RTSP (TCP)")];
[o_input_serverport_txt setStringValue: _NS("Default Server Port")]; [o_input_serverport_txt setStringValue: _NS("Default Server Port")];
[o_input_timeshift_ckb setTitle: _NS("Timeshift")];
/* interface */ /* interface */
[o_intf_art_txt setStringValue: _NS("Album art download policy")]; [o_intf_art_txt setStringValue: _NS("Album art download policy")];
...@@ -505,15 +500,6 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des ...@@ -505,15 +500,6 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
[o_input_rtsp_ckb setState: config_GetInt( p_intf, "rtsp-tcp" )]; [o_input_rtsp_ckb setState: config_GetInt( p_intf, "rtsp-tcp" )];
psz_tmp = config_GetPsz( p_intf, "access-filter" );
if( psz_tmp )
{
[o_input_record_ckb setState: (int)strstr( psz_tmp, "record" )];
[o_input_dump_ckb setState: (int)strstr( psz_tmp, "dump" )];
[o_input_bandwidth_ckb setState: (int)strstr( psz_tmp, "bandwidth" )];
[o_input_timeshift_ckb setState: (int)strstr( psz_tmp, "timeshift" )];
}
[o_input_cachelevel_pop removeAllItems]; [o_input_cachelevel_pop removeAllItems];
[o_input_cachelevel_pop addItemsWithTitles: [o_input_cachelevel_pop addItemsWithTitles:
[NSArray arrayWithObjects: _NS("Custom"), _NS("Lowest latency"), _NS("Low latency"), _NS("Normal"), [NSArray arrayWithObjects: _NS("Custom"), _NS("Lowest latency"), _NS("Low latency"), _NS("Normal"),
...@@ -883,27 +869,6 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -883,27 +869,6 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
} }
CaCi( "mms-caching", 19 ); CaCi( "mms-caching", 19 );
#define SaveAccessFilter( object, name ) \
if( [object state] == NSOnState ) \
{ \
if( b_first ) \
{ \
[o_temp appendString: name]; \
b_first = NO; \
} \
else \
[o_temp appendFormat: @":%@", name]; \
}
BOOL b_first = YES;
NSMutableString *o_temp = [[NSMutableString alloc] init];
SaveAccessFilter( o_input_record_ckb, @"record" );
SaveAccessFilter( o_input_dump_ckb, @"dump" );
SaveAccessFilter( o_input_bandwidth_ckb, @"bandwidth" );
SaveAccessFilter( o_input_timeshift_ckb, @"timeshift" );
config_PutPsz( p_intf, "access-filter", [o_temp UTF8String] );
[o_temp release];
i = config_SaveConfigFile( p_intf, "main" ); i = config_SaveConfigFile( p_intf, "main" );
i = i + config_SaveConfigFile( p_intf, "ffmpeg" ); i = i + config_SaveConfigFile( p_intf, "ffmpeg" );
i = i + config_SaveConfigFile( p_intf, "access_http" ); i = i + config_SaveConfigFile( p_intf, "access_http" );
......
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