Commit 3bb39472 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: added 'ffmpeg-skiploopfilter' to the simple prefs too and fixed the...

macosx: added 'ffmpeg-skiploopfilter' to the simple prefs too and fixed the postprocessing level setting, as the variable name changed
parent 20cba89c
......@@ -106,6 +106,8 @@
"o_input_rtsp_ckb" = id;
"o_input_serverport_fld" = id;
"o_input_serverport_txt" = id;
"o_input_skipLoop_pop" = id;
"o_input_skipLoop_txt" = id;
"o_input_view" = id;
"o_intf_art_pop" = id;
"o_intf_art_txt" = id;
......
......@@ -15,7 +15,7 @@
<key>2523</key>
<string>345 341 590 343 0 0 1280 778 </string>
<key>2562</key>
<string>258 273 590 505 0 0 1280 778 </string>
<string>344 333 590 444 0 0 1280 778 </string>
<key>2668</key>
<string>345 256 590 457 0 0 1280 778 </string>
</dict>
......@@ -29,6 +29,7 @@
<array>
<integer>2265</integer>
<integer>1530</integer>
<integer>2562</integer>
</array>
<key>IBSystem Version</key>
<string>9G55</string>
......
......@@ -79,6 +79,8 @@
IBOutlet id o_input_postproc_fld;
IBOutlet id o_input_postproc_txt;
IBOutlet id o_input_rtsp_ckb;
IBOutlet id o_input_skipLoop_txt;
IBOutlet id o_input_skipLoop_pop;
IBOutlet id o_input_serverport_fld;
IBOutlet id o_input_serverport_txt;
IBOutlet id o_input_view;
......
......@@ -253,6 +253,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
[o_input_net_box setTitle: _NS("Network")];
[o_input_postproc_txt setStringValue: _NS("Post-Processing Quality")];
[o_input_rtsp_ckb setTitle: _NS("Use RTP over RTSP (TCP)")];
[o_input_skipLoop_txt setStringValue: _NS("Skip the loop filter for H.264 decoding")];
[o_input_serverport_txt setStringValue: _NS("Default Server Port")];
/* interface */
......@@ -495,11 +496,12 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
[o_input_httpproxy_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "http-proxy" ) ?: ""]];
if( config_GetPsz( p_intf, "http-proxy" ) != NULL )
[o_input_httpproxypwd_sfld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "http-proxy-pwd" ) ?: ""]];
[o_input_postproc_fld setIntValue: config_GetInt( p_intf, "ffmpeg-pp-q" )];
[o_input_postproc_fld setIntValue: config_GetInt( p_intf, "postproc-q" )];
[self setupButton: o_input_avi_pop forIntList: "avi-index"];
[o_input_rtsp_ckb setState: config_GetInt( p_intf, "rtsp-tcp" )];
[self setupButton: o_input_skipLoop_pop forIntList: "ffmpeg-skiploopfilter"];
[o_input_cachelevel_pop removeAllItems];
[o_input_cachelevel_pop addItemsWithTitles:
......@@ -838,11 +840,12 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
config_PutInt( p_intf, "server-port", [o_input_serverport_fld intValue] );
config_PutPsz( p_intf, "http-proxy", [[o_input_httpproxy_fld stringValue] UTF8String] );
config_PutPsz( p_intf, "http-proxy-pwd", [[o_input_httpproxypwd_sfld stringValue] UTF8String] );
config_PutInt( p_intf, "ffmpeg-pp-q", [o_input_postproc_fld intValue] );
config_PutInt( p_intf, "postproc-q", [o_input_postproc_fld intValue] );
SaveIntList( o_input_avi_pop, "avi-index" );
config_PutInt( p_intf, "rtsp-tcp", [o_input_rtsp_ckb state] );
SaveIntList( o_input_skipLoop_pop, "ffmpeg-skiploopfilter" );
#define CaCi( name, int ) config_PutInt( p_intf, name, int * [[o_input_cachelevel_pop selectedItem] tag] )
#define CaC( name ) CaCi( name, 1 )
......@@ -871,7 +874,8 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
CaCi( "mms-caching", 19 );
i = config_SaveConfigFile( p_intf, "main" );
i = i + config_SaveConfigFile( p_intf, "ffmpeg" );
i = i + config_SaveConfigFile( p_intf, "avcodec" );
i = i + config_SaveConfigFile( p_intf, "postproc" );
i = i + config_SaveConfigFile( p_intf, "access_http" );
i = i + config_SaveConfigFile( p_intf, "access_file" );
i = i + config_SaveConfigFile( p_intf, "access_tcp" );
......
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