diff --git a/modules/gui/macosx/UI/SimplePreferences.xib b/modules/gui/macosx/UI/SimplePreferences.xib index 036ed61910..9723f8ae6d 100644 --- a/modules/gui/macosx/UI/SimplePreferences.xib +++ b/modules/gui/macosx/UI/SimplePreferences.xib @@ -1,5 +1,5 @@ - + @@ -48,6 +48,7 @@ + @@ -1294,10 +1295,10 @@ Gw - + - + @@ -1341,7 +1342,7 @@ Gw - + @@ -1368,7 +1369,7 @@ Gw - + @@ -1425,9 +1426,9 @@ Gw - + - + @@ -1525,6 +1526,16 @@ Gw + @@ -1532,22 +1543,26 @@ Gw + + + - + + - + @@ -2058,7 +2073,7 @@ Gw - + diff --git a/modules/gui/macosx/VLCSimplePrefsController.h b/modules/gui/macosx/VLCSimplePrefsController.h index 926feddeb5..ba4c5db670 100644 --- a/modules/gui/macosx/VLCSimplePrefsController.h +++ b/modules/gui/macosx/VLCSimplePrefsController.h @@ -85,6 +85,7 @@ @property (readwrite, weak) IBOutlet NSBox *input_cachingBox; @property (readwrite, weak) IBOutlet NSBox *input_muxBox; @property (readwrite, weak) IBOutlet NSBox *input_netBox; +@property (readwrite, weak) IBOutlet NSButton *input_hardwareAccelerationCheckbox; @property (readwrite, weak) IBOutlet NSTextField *input_postprocTextField; @property (readwrite, weak) IBOutlet NSTextField *input_postprocLabel; @property (readwrite, weak) IBOutlet NSTextField *input_skipLoopLabel; diff --git a/modules/gui/macosx/VLCSimplePrefsController.m b/modules/gui/macosx/VLCSimplePrefsController.m index bfd7183f83..feae10dabf 100644 --- a/modules/gui/macosx/VLCSimplePrefsController.m +++ b/modules/gui/macosx/VLCSimplePrefsController.m @@ -294,6 +294,7 @@ create_toolbar_item(NSString *itemIdent, NSString *name, NSString *desc, NSStrin [_input_cachelevel_customLabel setStringValue: _NS("Use the complete preferences to configure custom caching values for each access module.")]; [_input_muxBox setTitle: _NS("Codecs / Muxers")]; [_input_netBox setTitle: _NS("Network")]; + [_input_hardwareAccelerationCheckbox setTitle: _NS("Enable hardware acceleration")]; [_input_postprocLabel setStringValue: _NS("Post-Processing Quality")]; [_input_skipLoopLabel setStringValue: _NS("Skip the loop filter for H.264 decoding")]; [_input_urlhandlerButton setTitle: _NS("Edit default application settings for network protocols")]; @@ -677,6 +678,8 @@ static inline const char * __config_GetLabel(vlc_object_t *p_this, const char *p * input & codecs settings * ***************************/ [self setupField:_input_recordTextField forOption:"input-record-path"]; + + [self setupButton:_input_hardwareAccelerationCheckbox forBoolValue: "videotoolbox"]; [_input_postprocTextField setIntValue: config_GetInt("postproc-q")]; [_input_postprocTextField setToolTip: _NS(config_GetLabel(p_intf, "postproc-q"))]; [self setupButton:_input_skipFramesCheckbox forBoolValue: "skip-frames"]; @@ -993,6 +996,8 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ***************************/ if (_inputSettingChanged) { config_PutPsz("input-record-path", [[_input_recordTextField stringValue] UTF8String]); + + config_PutInt("videotoolbox", [_input_hardwareAccelerationCheckbox state]); config_PutInt("postproc-q", [_input_postprocTextField intValue]); config_PutInt("skip-frames", [_input_skipFramesCheckbox state]);