diff --git a/modules/gui/macosx/UI/SimplePreferences.xib b/modules/gui/macosx/UI/SimplePreferences.xib
index b4502e8e3a996f53b9750dc3b415c0264f2101bc..76506505f41880e08cbd77e67c4f8e22ca0c4c99 100644
--- a/modules/gui/macosx/UI/SimplePreferences.xib
+++ b/modules/gui/macosx/UI/SimplePreferences.xib
@@ -49,6 +49,7 @@
<outlet property="input_cachelevelPopup" destination="2580" id="lts-mx-3Kh"/>
<outlet property="input_cachelevel_customLabel" destination="3162" id="fbZ-oF-HKW"/>
<outlet property="input_cachingBox" destination="2572" id="EC7-3Y-jc1"/>
+ <outlet property="input_fastSeekCheckbox" destination="mFh-ke-4yF" id="auB-Bw-bo3"/>
<outlet property="input_hardwareAccelerationCheckbox" destination="E3R-AI-QGD" id="I73-W4-R8Y"/>
<outlet property="input_muxBox" destination="2585" id="Yng-39-8zd"/>
<outlet property="input_netBox" destination="2563" id="xSD-ks-oYK"/>
@@ -1267,6 +1268,16 @@ Gw
<action selector="inputSettingChanged:" target="-2" id="tI4-5J-NJ2"/>
</connections>
</button>
+ <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="mFh-ke-4yF">
+ <rect key="frame" x="437" y="11" width="80" height="18"/>
+ <buttonCell key="cell" type="check" title="Fast seek" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="XWc-M2-awg">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="inputSettingChanged:" target="-2" id="Dqa-wB-P4l"/>
+ </connections>
+ </button>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2594">
<rect key="frame" x="267" y="71" width="251" height="25"/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2598" id="3520">
@@ -1313,6 +1324,7 @@ Gw
</button>
</subviews>
<constraints>
+ <constraint firstItem="mFh-ke-4yF" firstAttribute="trailing" secondItem="3435" secondAttribute="trailing" id="5cw-wL-iQh"/>
<constraint firstItem="2593" firstAttribute="leading" secondItem="E3R-AI-QGD" secondAttribute="leading" id="5jy-4Z-Yf9"/>
<constraint firstItem="3434" firstAttribute="leading" secondItem="2593" secondAttribute="leading" id="DbT-Jq-Nxe"/>
<constraint firstItem="2594" firstAttribute="leading" secondItem="2593" secondAttribute="trailing" constant="17" id="H8f-vv-gko"/>
@@ -1325,15 +1337,14 @@ Gw
<constraint firstItem="E3R-AI-QGD" firstAttribute="top" secondItem="30i-kg-rYI" secondAttribute="top" constant="12" id="Uiy-Rc-Z9G"/>
<constraint firstItem="3435" firstAttribute="width" secondItem="2594" secondAttribute="width" id="V0T-ah-xQd"/>
<constraint firstItem="3434" firstAttribute="centerY" secondItem="3435" secondAttribute="centerY" id="WV5-Nx-zJo"/>
+ <constraint firstAttribute="bottom" secondItem="lem-yf-jZB" secondAttribute="bottom" constant="13" id="Y7N-0N-QVd"/>
<constraint firstItem="3435" firstAttribute="leading" secondItem="3434" secondAttribute="trailing" constant="17" id="eZZ-2v-na1"/>
<constraint firstItem="3435" firstAttribute="leading" secondItem="2594" secondAttribute="leading" id="h44-ac-8ao"/>
<constraint firstItem="2593" firstAttribute="centerY" secondItem="2594" secondAttribute="centerY" id="jae-OS-C7i"/>
<constraint firstItem="E3R-AI-QGD" firstAttribute="leading" secondItem="30i-kg-rYI" secondAttribute="leading" constant="16" id="v2C-3E-DlJ"/>
+ <constraint firstItem="mFh-ke-4yF" firstAttribute="centerY" secondItem="lem-yf-jZB" secondAttribute="centerY" id="v6Z-GB-X2Z"/>
</constraints>
</view>
- <constraints>
- <constraint firstAttribute="height" constant="152" id="rXT-GE-OGD"/>
- </constraints>
</box>
<box borderType="line" title="Record directory or filename" translatesAutoresizingMaskIntoConstraints="NO" id="3623">
<rect key="frame" x="17" y="179" width="538" height="62"/>
diff --git a/modules/gui/macosx/preferences/VLCSimplePrefsController.h b/modules/gui/macosx/preferences/VLCSimplePrefsController.h
index 46a119c5a45d86db75dcb604351b762be8a37aed..aefad7c187fceb2e3b3ec03ae31ab00570bd9551 100644
--- a/modules/gui/macosx/preferences/VLCSimplePrefsController.h
+++ b/modules/gui/macosx/preferences/VLCSimplePrefsController.h
@@ -105,6 +105,7 @@
@property (readwrite, weak) IBOutlet NSPopUpButton *input_skipLoopPopup;
@property (readwrite, weak) IBOutlet NSButton *input_urlhandlerButton;
@property (readwrite, weak) IBOutlet NSButton *input_skipFramesCheckbox;
+@property (readwrite, weak) IBOutlet NSButton *input_fastSeekCheckbox;
// intf pane - general box
@property (readwrite, strong) IBOutlet NSView *intfView;
diff --git a/modules/gui/macosx/preferences/VLCSimplePrefsController.m b/modules/gui/macosx/preferences/VLCSimplePrefsController.m
index aea737eb1501000e1e8c6aec3cb0e7301036e304..08ae70479ad5b095d6a6e588ea2c8a8cb0151163 100644
--- a/modules/gui/macosx/preferences/VLCSimplePrefsController.m
+++ b/modules/gui/macosx/preferences/VLCSimplePrefsController.m
@@ -359,6 +359,7 @@ create_toolbar_item(NSString *itemIdent, NSString *name, NSString *desc, NSStrin
[_input_skipLoopLabel setStringValue: _NS("Skip the loop filter for H.264 decoding")];
[_input_urlhandlerButton setTitle: _NS("Edit default application settings for network protocols")];
[_input_skipFramesCheckbox setTitle: _NS("Skip frames")];
+ [_input_fastSeekCheckbox setTitle: _NS("Fast seek")];
/* url handler */
[_urlhandler_titleLabel setStringValue: _NS("Open network streams using the following protocols")];
@@ -736,6 +737,7 @@ static inline const char * __config_GetLabel(vlc_object_t *p_this, const char *p
[self setupButton:_input_hardwareAccelerationCheckbox forBoolValue: "videotoolbox"];
[self setupButton:_input_skipFramesCheckbox forBoolValue: "skip-frames"];
+ [self setupButton:_input_fastSeekCheckbox forBoolValue: "input-fast-seek"];
[self setupButton:_input_aviPopup forIntList: "avi-index"];
[self setupButton:_input_skipLoopPopup forIntList: "avcodec-skiploopfilter"];
@@ -1044,6 +1046,7 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
config_PutInt("videotoolbox", [_input_hardwareAccelerationCheckbox state]);
config_PutInt("skip-frames", [_input_skipFramesCheckbox state]);
+ config_PutInt("input-fast-seek", [_input_fastSeekCheckbox state]);
SaveIntList(_input_aviPopup, "avi-index");