summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorDamiano Galassi <[email protected]>2018-10-27 15:46:52 +0200
committerDamiano Galassi <[email protected]>2018-10-27 15:46:52 +0200
commit36f5330eb113f7917de31e57a79611c7ad661cc4 (patch)
tree847f3a9f60d8f9d1f5b983e767f3df26c2f0fadd /macosx
parent723649850dd9c47af15e6319a28bba1fb8cefee1 (diff)
MacGui: move the advanced x264 panel to the 'Additional options' text field contextual menu.
Diffstat (limited to 'macosx')
-rw-r--r--macosx/Base.lproj/AdvancedView.xib220
-rw-r--r--macosx/Base.lproj/MainWindow.xib15
-rw-r--r--macosx/Base.lproj/Preferences.xib48
-rw-r--r--macosx/Base.lproj/Video.xib31
-rw-r--r--macosx/HBAdvancedController.h2
-rw-r--r--macosx/HBAdvancedController.m85
-rw-r--r--macosx/HBController.m45
-rw-r--r--macosx/HBJob+HBJobConversion.m41
-rw-r--r--macosx/HBJob+UIAdditions.m64
-rw-r--r--macosx/HBVideo.h1
-rw-r--r--macosx/HBVideo.m28
-rw-r--r--macosx/HBVideoController.h3
-rw-r--r--macosx/HBVideoController.m123
13 files changed, 236 insertions, 470 deletions
diff --git a/macosx/Base.lproj/AdvancedView.xib b/macosx/Base.lproj/AdvancedView.xib
index 17dce4005..8e8cdc445 100644
--- a/macosx/Base.lproj/AdvancedView.xib
+++ b/macosx/Base.lproj/AdvancedView.xib
@@ -1,17 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8164.2" systemVersion="15A225f" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.30.1" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment identifier="macosx"/>
- <development version="6300" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8164.2"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.30.1"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="HBAdvancedController">
<connections>
<outlet property="fDisplayX264Options" destination="30" id="191"/>
- <outlet property="fDisplayX264OptionsLabel" destination="55" id="192"/>
- <outlet property="fEmptyView" destination="nxI-yk-oWT" id="vLJ-P2-ROb"/>
- <outlet property="fOptionsBox" destination="sPV-JX-8CO" id="OhE-r2-gaB"/>
<outlet property="fX264opt8x8dctLabel" destination="88" id="196"/>
<outlet property="fX264opt8x8dctSwitch" destination="87" id="195"/>
<outlet property="fX264optAlphaDeblockPopUp" destination="56" id="197"/>
@@ -47,22 +44,20 @@
<outlet property="fX264optSubmePopUp" destination="18" id="228"/>
<outlet property="fX264optTrellisLabel" destination="23" id="231"/>
<outlet property="fX264optTrellisPopUp" destination="74" id="230"/>
- <outlet property="fX264optView" destination="5" id="194"/>
<outlet property="fX264optWeightPLabel" destination="408" id="413"/>
<outlet property="fX264optWeightPSwitch" destination="407" id="414"/>
- <outlet property="view" destination="kZH-f0-3MZ" id="vhL-OP-goq"/>
+ <outlet property="view" destination="5" id="eJR-m1-Nl1"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <customView id="5" userLabel="x264">
- <rect key="frame" x="0.0" y="0.0" width="891" height="290"/>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="5" userLabel="x264">
+ <rect key="frame" x="0.0" y="0.0" width="843" height="374"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<slider verticalHuggingPriority="750" id="389">
- <rect key="frame" x="454" y="63" width="146" height="16"/>
+ <rect key="frame" x="442" y="128" width="146" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<sliderCell key="cell" controlSize="mini" continuous="YES" state="on" alignment="left" maxValue="1" tickMarkPosition="below" numberOfTickMarks="11" allowsTickMarkValuesOnly="YES" sliderType="linear" id="390">
<font key="font" metaFont="miniSystem"/>
</sliderCell>
@@ -71,9 +66,8 @@
</connections>
</slider>
<textField verticalHuggingPriority="750" id="388">
- <rect key="frame" x="298" y="65" width="151" height="16"/>
+ <rect key="frame" x="285" y="130" width="151" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Psychovisual Trellis:" id="391">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -81,9 +75,8 @@
</textFieldCell>
</textField>
<slider verticalHuggingPriority="750" id="384">
- <rect key="frame" x="454" y="84" width="146" height="16"/>
+ <rect key="frame" x="442" y="149" width="146" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<sliderCell key="cell" controlSize="mini" continuous="YES" state="on" alignment="left" maxValue="1" doubleValue="1" tickMarkPosition="below" numberOfTickMarks="11" allowsTickMarkValuesOnly="YES" sliderType="linear" id="385">
<font key="font" metaFont="miniSystem"/>
</sliderCell>
@@ -92,9 +85,8 @@
</connections>
</slider>
<textField verticalHuggingPriority="750" id="90">
- <rect key="frame" x="4" y="212" width="123" height="16"/>
+ <rect key="frame" x="21" y="277" width="123" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="right" title="CABAC Entropy Coding:" id="380">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -102,9 +94,8 @@
</textFieldCell>
</textField>
<button id="89">
- <rect key="frame" x="129" y="212" width="22" height="18"/>
+ <rect key="frame" x="146" y="277" width="22" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="379">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -114,9 +105,8 @@
</connections>
</button>
<textField verticalHuggingPriority="750" id="88">
- <rect key="frame" x="2" y="191" width="125" height="16"/>
+ <rect key="frame" x="19" y="256" width="125" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="8x8 Transform:" id="378">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -124,9 +114,8 @@
</textFieldCell>
</textField>
<button id="87">
- <rect key="frame" x="129" y="191" width="22" height="18"/>
+ <rect key="frame" x="146" y="256" width="22" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="377">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -136,9 +125,8 @@
</connections>
</button>
<textField verticalHuggingPriority="750" id="86">
- <rect key="frame" x="662" y="254" width="95" height="16"/>
+ <rect key="frame" x="599" y="319" width="95" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Partition Types:" id="376">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -146,9 +134,8 @@
</textFieldCell>
</textField>
<popUpButton verticalHuggingPriority="750" id="81">
- <rect key="frame" x="758" y="256" width="130" height="15"/>
+ <rect key="frame" x="695" y="321" width="130" height="15"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
- <animations/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="84" id="375">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="miniSystem"/>
@@ -165,9 +152,8 @@
</connections>
</popUpButton>
<popUpButton verticalHuggingPriority="750" id="74">
- <rect key="frame" x="758" y="235" width="130" height="15"/>
+ <rect key="frame" x="695" y="300" width="130" height="15"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
- <animations/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="77" id="374">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="miniSystem"/>
@@ -184,9 +170,8 @@
</connections>
</popUpButton>
<button id="73">
- <rect key="frame" x="129" y="107" width="22" height="18"/>
+ <rect key="frame" x="146" y="172" width="22" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="373">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -196,9 +181,8 @@
</connections>
</button>
<textField verticalHuggingPriority="750" id="66">
- <rect key="frame" x="689" y="107" width="68" height="16"/>
+ <rect key="frame" x="626" y="172" width="68" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Deblocking:" id="366">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -206,9 +190,8 @@
</textFieldCell>
</textField>
<popUpButton verticalHuggingPriority="750" id="61">
- <rect key="frame" x="758" y="88" width="130" height="15"/>
+ <rect key="frame" x="695" y="153" width="130" height="15"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
- <animations/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingHead" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="63" id="365">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="miniSystem"/>
@@ -225,9 +208,8 @@
</connections>
</popUpButton>
<popUpButton verticalHuggingPriority="750" id="56">
- <rect key="frame" x="758" y="109" width="130" height="15"/>
+ <rect key="frame" x="695" y="174" width="130" height="15"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
- <animations/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingHead" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="58" id="364">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="miniSystem"/>
@@ -243,20 +225,9 @@
<action selector="X264AdvancedOptionsChanged:" target="-2" id="248"/>
</connections>
</popUpButton>
- <textField verticalHuggingPriority="750" id="55">
- <rect key="frame" x="1" y="45" width="222" height="14"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <animations/>
- <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Current x264 Advanced Option String:" id="363">
- <font key="font" metaFont="smallSystemBold"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
<popUpButton verticalHuggingPriority="750" id="50">
- <rect key="frame" x="453" y="235" width="149" height="15"/>
+ <rect key="frame" x="441" y="300" width="149" height="15"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="54" id="362">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="miniSystem"/>
@@ -273,9 +244,8 @@
</connections>
</popUpButton>
<textField verticalHuggingPriority="750" id="49">
- <rect key="frame" x="298" y="233" width="151" height="16"/>
+ <rect key="frame" x="285" y="298" width="151" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Adaptive Direct Mode:" id="361">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -283,9 +253,8 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="382">
- <rect key="frame" x="298" y="86" width="151" height="16"/>
+ <rect key="frame" x="285" y="151" width="151" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Psychovisual Rate Distortion:" id="383">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -293,9 +262,8 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="46">
- <rect key="frame" x="2" y="149" width="125" height="16"/>
+ <rect key="frame" x="19" y="214" width="125" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Pyramidal B-Frames:" id="358">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -303,9 +271,8 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="44">
- <rect key="frame" x="285" y="191" width="164" height="16"/>
+ <rect key="frame" x="272" y="256" width="164" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Subpixel ME &amp; Mode Decision:" id="356">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -313,9 +280,8 @@
</textFieldCell>
</textField>
<popUpButton verticalHuggingPriority="750" id="39">
- <rect key="frame" x="453" y="172" width="149" height="15"/>
+ <rect key="frame" x="441" y="237" width="149" height="15"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="41" id="355">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="miniSystem"/>
@@ -332,9 +298,8 @@
</connections>
</popUpButton>
<textField verticalHuggingPriority="750" id="38">
- <rect key="frame" x="298" y="170" width="151" height="16"/>
+ <rect key="frame" x="285" y="235" width="151" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Motion Estimation Range:" id="354">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -342,9 +307,8 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="37">
- <rect key="frame" x="298" y="212" width="151" height="16"/>
+ <rect key="frame" x="285" y="277" width="151" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Motion Estimation Method:" id="353">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -352,9 +316,8 @@
</textFieldCell>
</textField>
<popUpButton verticalHuggingPriority="750" id="32">
- <rect key="frame" x="453" y="214" width="149" height="15"/>
+ <rect key="frame" x="441" y="279" width="149" height="15"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="36" id="352">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="miniSystem"/>
@@ -371,12 +334,11 @@
</connections>
</popUpButton>
<textField verticalHuggingPriority="750" id="30">
- <rect key="frame" x="4" y="7" width="882" height="34"/>
+ <rect key="frame" x="20" y="50" width="803" height="34"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
- <animations/>
<textFieldCell key="cell" controlSize="small" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="350">
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@@ -384,9 +346,8 @@
</connections>
</textField>
<textField verticalHuggingPriority="750" id="24">
- <rect key="frame" x="24" y="107" width="103" height="16"/>
+ <rect key="frame" x="41" y="172" width="103" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="No DCT Decimation:" id="348">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -394,9 +355,8 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="23">
- <rect key="frame" x="662" y="233" width="95" height="16"/>
+ <rect key="frame" x="599" y="298" width="95" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Trellis:" id="347">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -404,9 +364,8 @@
</textFieldCell>
</textField>
<popUpButton verticalHuggingPriority="750" id="18">
- <rect key="frame" x="453" y="193" width="149" height="15"/>
+ <rect key="frame" x="441" y="258" width="149" height="15"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="20" id="346">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="miniSystem"/>
@@ -423,9 +382,8 @@
</connections>
</popUpButton>
<popUpButton verticalHuggingPriority="750" id="398">
- <rect key="frame" x="453" y="256" width="149" height="15"/>
+ <rect key="frame" x="441" y="321" width="149" height="15"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="403" id="399">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="miniSystem"/>
@@ -442,9 +400,8 @@
</connections>
</popUpButton>
<popUpButton verticalHuggingPriority="750" id="13">
- <rect key="frame" x="131" y="235" width="97" height="15"/>
+ <rect key="frame" x="148" y="300" width="97" height="15"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="17" id="345">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="miniSystem"/>
@@ -461,9 +418,8 @@
</connections>
</popUpButton>
<textField verticalHuggingPriority="750" id="396">
- <rect key="frame" x="298" y="254" width="151" height="16"/>
+ <rect key="frame" x="285" y="319" width="151" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Adaptive B-Frames:" id="397">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -471,9 +427,8 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="12">
- <rect key="frame" x="2" y="233" width="125" height="16"/>
+ <rect key="frame" x="19" y="298" width="125" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Maximum B-Frames:" id="344">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -481,9 +436,8 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="11">
- <rect key="frame" x="2" y="254" width="125" height="16"/>
+ <rect key="frame" x="19" y="319" width="125" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Reference Frames:" id="343">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -491,9 +445,8 @@
</textFieldCell>
</textField>
<popUpButton verticalHuggingPriority="750" id="6">
- <rect key="frame" x="131" y="256" width="97" height="15"/>
+ <rect key="frame" x="148" y="321" width="97" height="15"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="8" id="342">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="miniSystem"/>
@@ -510,9 +463,8 @@
</connections>
</popUpButton>
<button id="407">
- <rect key="frame" x="129" y="170" width="22" height="18"/>
+ <rect key="frame" x="146" y="235" width="22" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="410">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -522,9 +474,8 @@
</connections>
</button>
<textField verticalHuggingPriority="750" id="408">
- <rect key="frame" x="2" y="170" width="125" height="16"/>
+ <rect key="frame" x="19" y="235" width="125" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Weighted P-Frames:" id="409">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -532,9 +483,8 @@
</textFieldCell>
</textField>
<slider verticalHuggingPriority="750" id="420">
- <rect key="frame" x="454" y="105" width="146" height="16"/>
+ <rect key="frame" x="442" y="170" width="146" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<sliderCell key="cell" controlSize="mini" continuous="YES" state="on" alignment="left" maxValue="1" tickMarkPosition="below" numberOfTickMarks="11" allowsTickMarkValuesOnly="YES" sliderType="linear" id="423">
<font key="font" metaFont="miniSystem"/>
</sliderCell>
@@ -543,9 +493,8 @@
</connections>
</slider>
<textField verticalHuggingPriority="750" id="421">
- <rect key="frame" x="298" y="107" width="151" height="16"/>
+ <rect key="frame" x="285" y="172" width="151" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Adaptive Quantization:" id="422">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -553,9 +502,8 @@
</textFieldCell>
</textField>
<popUpButton verticalHuggingPriority="750" id="427">
- <rect key="frame" x="131" y="151" width="97" height="15"/>
+ <rect key="frame" x="148" y="216" width="97" height="15"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="430" id="428">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="miniSystem"/>
@@ -572,9 +520,8 @@
</connections>
</popUpButton>
<textField verticalHuggingPriority="750" id="438">
- <rect key="frame" x="1" y="128" width="91" height="14"/>
+ <rect key="frame" x="18" y="193" width="91" height="14"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Psychovisual" id="439">
<font key="font" metaFont="smallSystemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -582,9 +529,8 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="440">
- <rect key="frame" x="1" y="275" width="66" height="14"/>
+ <rect key="frame" x="18" y="340" width="66" height="14"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Encoding" id="441">
<font key="font" metaFont="smallSystemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -592,53 +538,53 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="442">
- <rect key="frame" x="298" y="275" width="61" height="14"/>
+ <rect key="frame" x="285" y="340" width="61" height="14"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
- <animations/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Analysis" id="443">
<font key="font" metaFont="smallSystemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- </subviews>
- <animations/>
- </customView>
- <customView id="kZH-f0-3MZ" userLabel="view">
- <rect key="frame" x="0.0" y="0.0" width="905" height="294"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <subviews>
- <box autoresizesSubviews="NO" title="Box" borderType="none" titlePosition="noTitle" id="sPV-JX-8CO">
- <rect key="frame" x="7" y="-4" width="890" height="290"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <view key="contentView">
- <rect key="frame" x="0.0" y="0.0" width="890" height="290"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <animations/>
- </view>
- <animations/>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
- </box>
- </subviews>
- <animations/>
- </customView>
- <customView id="nxI-yk-oWT" userLabel="empty">
- <rect key="frame" x="0.0" y="0.0" width="905" height="294"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <subviews>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="60D-Fv-Yl5">
- <rect key="frame" x="18" y="139" width="869" height="17"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
- <animations/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Advanced options not available for the selected codec." id="lPc-aK-FOh">
- <font key="font" metaFont="system"/>
+ <button verticalHuggingPriority="750" id="qjC-VL-t4n">
+ <rect key="frame" x="752" y="14" width="76" height="27"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="lV4-j0-O2Y">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="smallSystem"/>
+ <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="ok:" target="-2" id="IhB-Gf-tDt"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" id="c1F-sK-kU5">
+ <rect key="frame" x="662" y="14" width="84" height="27"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="w0T-fl-8Fm">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="smallSystem"/>
+ <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="dismissController:" target="-2" id="gbL-jp-jfc"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="55">
+ <rect key="frame" x="19" y="92" width="222" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Current x264 Advanced Option String" id="363">
+ <font key="font" metaFont="smallSystemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
- <animations/>
+ <point key="canvasLocation" x="114.5" y="209"/>
</customView>
</objects>
</document>
diff --git a/macosx/Base.lproj/MainWindow.xib b/macosx/Base.lproj/MainWindow.xib
index fd577a809..9cff4bca5 100644
--- a/macosx/Base.lproj/MainWindow.xib
+++ b/macosx/Base.lproj/MainWindow.xib
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.23.1" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.30.1" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.23.1"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.30.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="HBController">
<connections>
<outlet property="bottomConstrain" destination="Unb-Sk-dKC" id="f1i-gz-VIc"/>
- <outlet property="fAdvancedTab" destination="2015" id="8FF-6a-xSj"/>
<outlet property="fAudioTab" destination="1475" id="AJX-Da-Tfc"/>
<outlet property="fChaptersTitlesTab" destination="1989" id="df9-TK-GBD"/>
<outlet property="fFiltersTab" destination="0UB-bG-kwS" id="9at-ML-tDd"/>
@@ -54,7 +53,7 @@
<tabViewItems>
<tabViewItem label="Summary" identifier="" id="BA0-eg-2Ka">
<view key="view" id="BjX-E2-6tb">
- <rect key="frame" x="10" y="29" width="839" height="340"/>
+ <rect key="frame" x="10" y="25" width="839" height="344"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
</tabViewItem>
@@ -94,12 +93,6 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
</tabViewItem>
- <tabViewItem label="Advanced" identifier="6" id="2015">
- <view key="view" id="2016">
- <rect key="frame" x="10" y="29" width="836" height="337"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- </view>
- </tabViewItem>
</tabViewItems>
<connections>
<outlet property="dropDelegate" destination="-2" id="PXr-K3-L2R"/>
@@ -771,7 +764,7 @@ Blu-ray and DVD sources often have multiple titles, the longest of which is typi
<popUpButton key="view" imageHugsTitle="YES" id="pJJ-0V-TQq">
<rect key="frame" x="28" y="14" width="58" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
- <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="BAK-n3-eIN">
+ <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="addtitlestoqueue" alignment="center" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="BAK-n3-eIN">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
<menu key="menu" id="QCi-1O-Msg">
diff --git a/macosx/Base.lproj/Preferences.xib b/macosx/Base.lproj/Preferences.xib
index 414513d16..82e504989 100644
--- a/macosx/Base.lproj/Preferences.xib
+++ b/macosx/Base.lproj/Preferences.xib
@@ -353,11 +353,11 @@
<point key="canvasLocation" x="487" y="-196"/>
</customView>
<customView id="236" userLabel="Advanced">
- <rect key="frame" x="0.0" y="0.0" width="454" height="292"/>
+ <rect key="frame" x="0.0" y="0.0" width="454" height="266"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="4UU-uq-R9U">
- <rect key="frame" x="16" y="0.0" width="422" height="292"/>
+ <rect key="frame" x="16" y="0.0" width="422" height="266"/>
<subviews>
<popUpButton toolTip="Verbosity Level. Extended verbosity records more technical information to the Activity Log. Minimal verbosity records less." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="363">
<rect key="frame" x="174" y="89" width="90" height="22"/>
@@ -378,7 +378,7 @@
</connections>
</popUpButton>
<popUpButton toolTip="Determines the granularity of the x264 Constant Quality control. Smaller values allow for finer quality increments." horizontalHuggingPriority="249" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="387">
- <rect key="frame" x="294" y="253" width="60" height="22"/>
+ <rect key="frame" x="294" y="227" width="60" height="22"/>
<popUpButtonCell key="cell" type="push" title="0.25" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="391" id="388">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -401,7 +401,7 @@
</connections>
</popUpButton>
<button toolTip="Use libdvdnav to read DVDs. Only disable this for problematic DVDs where libdvdread works better (rare)." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="398">
- <rect key="frame" x="82" y="126" width="219" height="18"/>
+ <rect key="frame" x="82" y="125" width="219" height="18"/>
<buttonCell key="cell" type="check" title="Use libdvdnav (instead of libdvdread)" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="399">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -421,7 +421,7 @@
</connections>
</button>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="442">
- <rect key="frame" x="-2" y="128" width="81" height="14"/>
+ <rect key="frame" x="-2" y="127" width="81" height="14"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="DVD Reader:" id="443">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -429,7 +429,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="248" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="IV7-SY-HLR">
- <rect key="frame" x="-2" y="199" width="81" height="14"/>
+ <rect key="frame" x="-2" y="198" width="81" height="14"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Title Scan:" id="c0L-TU-WML">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -437,7 +437,7 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="jPa-4p-Y29">
- <rect key="frame" x="-2" y="258" width="81" height="14"/>
+ <rect key="frame" x="-2" y="232" width="81" height="14"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="x264 Encoder:" id="cqp-xU-GOe">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -461,7 +461,7 @@
</textFieldCell>
</textField>
<textField toolTip="Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="359">
- <rect key="frame" x="83" y="177" width="195" height="14"/>
+ <rect key="frame" x="83" y="176" width="195" height="14"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Number of picture previews to scan:" id="360">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -469,7 +469,7 @@
</textFieldCell>
</textField>
<textField toolTip="Minimum title duration in seconds. Shorter titles will be skipped." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="463">
- <rect key="frame" x="83" y="199" width="167" height="14"/>
+ <rect key="frame" x="83" y="198" width="167" height="14"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Minimum title duration to scan:" id="464">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -477,7 +477,7 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="UXr-op-aKN">
- <rect key="frame" x="301" y="199" width="49" height="14"/>
+ <rect key="frame" x="301" y="198" width="49" height="14"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="seconds" id="klQ-DW-Kc6">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -485,7 +485,7 @@
</textFieldCell>
</textField>
<textField toolTip="Determines the granularity of the x264 Constant Quality control. Smaller values allow for finer quality increments." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="395">
- <rect key="frame" x="83" y="258" width="208" height="14"/>
+ <rect key="frame" x="83" y="232" width="208" height="14"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Constant Quality fractional granularity:" id="396">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -493,7 +493,7 @@
</textFieldCell>
</textField>
<textField toolTip="Minimum title duration in seconds. Shorter titles will be skipped." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="480">
- <rect key="frame" x="256" y="196" width="40" height="19"/>
+ <rect key="frame" x="256" y="195" width="40" height="19"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="y5Z-y6-LMm"/>
</constraints>
@@ -508,7 +508,7 @@
</connections>
</textField>
<popUpButton toolTip="Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="352">
- <rect key="frame" x="281" y="172" width="56" height="22"/>
+ <rect key="frame" x="281" y="171" width="56" height="22"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="ASh-ct-Imw"/>
</constraints>
@@ -562,21 +562,8 @@
<binding destination="61" name="value" keyPath="values.HBClearOldLogs" id="98r-xV-IVB"/>
</connections>
</button>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ybi-46-yhY">
- <rect key="frame" x="82" y="235" width="254" height="18"/>
- <string key="toolTip">Show the Advanced Options Panel for x264 settings.
-
-This setting is no longer supported and may be removed in a future version. Use at your own risk!</string>
- <buttonCell key="cell" type="check" title="Show Advanced Options Panel (deprecated)" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="Du1-9x-nHn">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="smallSystem"/>
- </buttonCell>
- <connections>
- <binding destination="61" name="value" keyPath="values.HBShowAdvancedTab" id="PgA-TV-kBr"/>
- </connections>
- </button>
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="I0X-1x-9qe">
- <rect key="frame" x="0.0" y="156" width="422" height="5"/>
+ <rect key="frame" x="0.0" y="155" width="422" height="5"/>
</box>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="sRQ-Oe-1xH">
<rect key="frame" x="-2" y="19" width="81" height="14"/>
@@ -624,10 +611,8 @@ This setting is no longer supported and may be removed in a future version. Use
<constraint firstItem="jPa-4p-Y29" firstAttribute="leading" secondItem="4UU-uq-R9U" secondAttribute="leading" id="0XL-N8-hhe"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="363" secondAttribute="trailing" constant="20" id="0by-WQ-IEO"/>
<constraint firstItem="442" firstAttribute="leading" secondItem="jPa-4p-Y29" secondAttribute="leading" id="0y2-cf-8RZ"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="ybi-46-yhY" secondAttribute="trailing" id="5KQ-eS-SOh"/>
<constraint firstItem="359" firstAttribute="baseline" secondItem="352" secondAttribute="baseline" id="7tL-h8-5AB"/>
<constraint firstItem="395" firstAttribute="baseline" secondItem="387" secondAttribute="baseline" id="80j-Xc-t7X"/>
- <constraint firstItem="463" firstAttribute="top" secondItem="ybi-46-yhY" secondAttribute="bottom" constant="25" id="ANO-Sf-GW8"/>
<constraint firstItem="347" firstAttribute="leading" secondItem="371" secondAttribute="leading" id="Bwa-R1-Sg0"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="UXr-op-aKN" secondAttribute="trailing" id="CRS-Yq-1Ur"/>
<constraint firstItem="htF-lD-ZBh" firstAttribute="baseline" secondItem="sRQ-Oe-1xH" secondAttribute="baseline" id="DMh-iO-Tvh"/>
@@ -639,8 +624,9 @@ This setting is no longer supported and may be removed in a future version. Use
<constraint firstItem="Koh-5H-cdo" firstAttribute="leading" secondItem="PaR-zw-opS" secondAttribute="trailing" constant="7" id="Hd0-hx-WId"/>
<constraint firstItem="350" firstAttribute="baseline" secondItem="371" secondAttribute="baseline" id="KJC-CV-ZFy"/>
<constraint firstItem="Ndp-Xh-ohY" firstAttribute="top" secondItem="347" secondAttribute="bottom" constant="8" id="Kgc-7G-m3M"/>
+ <constraint firstItem="463" firstAttribute="top" secondItem="395" secondAttribute="bottom" constant="20" id="LNo-ir-2Ih"/>
<constraint firstItem="jPa-4p-Y29" firstAttribute="top" secondItem="4UU-uq-R9U" secondAttribute="top" constant="20" id="Mib-9l-uBL"/>
- <constraint firstItem="371" firstAttribute="top" secondItem="398" secondAttribute="bottom" constant="21" id="Mt3-Wx-Kuh"/>
+ <constraint firstItem="371" firstAttribute="top" secondItem="398" secondAttribute="bottom" constant="20" id="Mt3-Wx-Kuh"/>
<constraint firstItem="442" firstAttribute="width" secondItem="jPa-4p-Y29" secondAttribute="width" id="Pqh-h0-NeI"/>
<constraint firstItem="UXr-op-aKN" firstAttribute="leading" secondItem="480" secondAttribute="trailing" constant="7" id="TR5-Sj-PDx"/>
<constraint firstItem="htF-lD-ZBh" firstAttribute="leading" secondItem="sRQ-Oe-1xH" secondAttribute="trailing" constant="8" id="TW2-Vp-Dg8"/>
@@ -655,7 +641,6 @@ This setting is no longer supported and may be removed in a future version. Use
<constraint firstItem="363" firstAttribute="leading" secondItem="371" secondAttribute="trailing" constant="8" id="ao3-b4-L3n"/>
<constraint firstItem="480" firstAttribute="baseline" secondItem="UXr-op-aKN" secondAttribute="baseline" id="bpm-N7-n6P"/>
<constraint firstItem="395" firstAttribute="leading" secondItem="jPa-4p-Y29" secondAttribute="trailing" constant="8" id="caX-fe-X6B"/>
- <constraint firstItem="ybi-46-yhY" firstAttribute="top" secondItem="395" secondAttribute="bottom" constant="8" id="dCc-Sn-atf"/>
<constraint firstItem="IV7-SY-HLR" firstAttribute="baseline" secondItem="463" secondAttribute="baseline" id="dGu-2J-ulw"/>
<constraint firstItem="398" firstAttribute="leading" secondItem="442" secondAttribute="trailing" constant="8" id="eps-Ux-xp1"/>
<constraint firstItem="IV7-SY-HLR" firstAttribute="leading" secondItem="jPa-4p-Y29" secondAttribute="leading" id="gET-Go-zxJ"/>
@@ -677,7 +662,6 @@ This setting is no longer supported and may be removed in a future version. Use
<constraint firstItem="htF-lD-ZBh" firstAttribute="top" secondItem="Ndp-Xh-ohY" secondAttribute="bottom" constant="22" id="ujO-hF-lGo"/>
<constraint firstItem="463" firstAttribute="baseline" secondItem="480" secondAttribute="baseline" id="ulv-OM-ioh"/>
<constraint firstItem="359" firstAttribute="top" secondItem="463" secondAttribute="bottom" constant="8" id="uzg-mY-YoJ"/>
- <constraint firstItem="ybi-46-yhY" firstAttribute="leading" secondItem="395" secondAttribute="leading" id="vfq-uw-S0v"/>
<constraint firstItem="PaR-zw-opS" firstAttribute="baseline" secondItem="htF-lD-ZBh" secondAttribute="baseline" id="wLK-IO-wMW"/>
<constraint firstItem="I0X-1x-9qe" firstAttribute="leading" secondItem="4UU-uq-R9U" secondAttribute="leading" id="zfW-ta-RNq"/>
</constraints>
diff --git a/macosx/Base.lproj/Video.xib b/macosx/Base.lproj/Video.xib
index e35a31259..f216a228c 100644
--- a/macosx/Base.lproj/Video.xib
+++ b/macosx/Base.lproj/Video.xib
@@ -8,8 +8,8 @@
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="HBVideoController">
<connections>
+ <outlet property="additionalsOptions" destination="oJk-ur-wgc" id="OEm-fb-AY8"/>
<outlet property="fDisplayX264PresetsUnparseTextField" destination="wk1-2U-z4i" id="aIk-h1-bOP"/>
- <outlet property="fDividerLine" destination="FHY-Ih-1rd" id="sc2-Iw-XH1"/>
<outlet property="fEncoderOptionsLabel" destination="mkM-81-g3d" id="eWq-95-kTO"/>
<outlet property="fFramerateVfrPfrButton" destination="Fc1-EX-DWd" id="0Jj-Pc-4iW"/>
<outlet property="fPresetView" destination="2dX-Hf-Hxl" id="OEP-rM-gGp"/>
@@ -17,7 +17,6 @@
<outlet property="fPresetsSlider" destination="Biw-5K-pPD" id="so9-VX-eit"/>
<outlet property="fSimplePresetView" destination="aRi-vN-oR0" id="e0P-NK-oHv"/>
<outlet property="fVidQualitySlider" destination="GPu-Ht-bKg" id="faR-df-PGL"/>
- <outlet property="fX264UseAdvancedOptionsCheck" destination="Zs7-1Y-50A" id="WWx-OC-tor"/>
<outlet property="view" destination="wAC-5p-nXb" id="i3V-vv-tDn"/>
</connections>
</customObject>
@@ -548,24 +547,6 @@ Syntax: option-1=foo:opt2=bar,baz</string>
<binding destination="-2" name="value" keyPath="self.video.preset" id="yix-Fd-Qfi"/>
</connections>
</textField>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="Zs7-1Y-50A">
- <rect key="frame" x="116" y="178" width="174" height="18"/>
- <string key="toolTip">Use the Advanced Options Panel for x264 settings.
-
-This setting is no longer supported and may be removed in a future version. Use at your own risk!</string>
- <buttonCell key="cell" type="check" title="Use Advanced Options Panel" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="sa6-r3-eVr">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="smallSystem"/>
- </buttonCell>
- <connections>
- <binding destination="-2" name="enabled" keyPath="self.video" id="GDV-uX-eAs">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.video.advancedOptions" id="sQg-ab-NdN"/>
- </connections>
- </button>
<textField toolTip="Displays all internal video encoder options." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="1000" translatesAutoresizingMaskIntoConstraints="NO" id="wk1-2U-z4i">
<rect key="frame" x="18" y="12" width="884" height="50"/>
<constraints>
@@ -608,14 +589,15 @@ This setting is no longer supported and may be removed in a future version. Use
</slider>
</subviews>
<constraints>
+ <constraint firstItem="FHY-Ih-1rd" firstAttribute="leading" secondItem="mkM-81-g3d" secondAttribute="trailing" constant="8" id="3G2-hx-8o2"/>
<constraint firstItem="wk1-2U-z4i" firstAttribute="leading" secondItem="2dX-Hf-Hxl" secondAttribute="leading" constant="20" id="3kM-Si-5bP"/>
- <constraint firstItem="FHY-Ih-1rd" firstAttribute="centerY" secondItem="Zs7-1Y-50A" secondAttribute="centerY" id="4ke-iI-zRn"/>
<constraint firstItem="Biw-5K-pPD" firstAttribute="leading" secondItem="0sa-ep-yfr" secondAttribute="trailing" constant="8" id="508-6c-imQ"/>
<constraint firstItem="z7F-H2-Vfr" firstAttribute="leading" secondItem="A7d-wM-Xmp" secondAttribute="trailing" constant="21" id="5Fh-Ft-8yx"/>
<constraint firstItem="A7d-wM-Xmp" firstAttribute="leading" secondItem="gzq-SL-YVY" secondAttribute="trailing" constant="8" id="6Pp-Lz-PWg"/>
<constraint firstItem="Biw-5K-pPD" firstAttribute="top" secondItem="mkM-81-g3d" secondAttribute="bottom" constant="7" id="6Xb-Jy-J4E"/>
<constraint firstItem="A7d-wM-Xmp" firstAttribute="top" secondItem="Biw-5K-pPD" secondAttribute="bottom" constant="8" id="7Bq-IJ-UHE"/>
- <constraint firstItem="FHY-Ih-1rd" firstAttribute="leading" secondItem="Zs7-1Y-50A" secondAttribute="leading" id="BD4-Ri-bQ2"/>
+ <constraint firstAttribute="trailing" secondItem="FHY-Ih-1rd" secondAttribute="trailing" constant="20" id="8Jj-Q6-WXo"/>
+ <constraint firstItem="FHY-Ih-1rd" firstAttribute="centerY" secondItem="mkM-81-g3d" secondAttribute="centerY" id="9JU-Qg-Nak"/>
<constraint firstItem="Biw-5K-pPD" firstAttribute="baseline" secondItem="0sa-ep-yfr" secondAttribute="baseline" id="Cbm-Km-GEi"/>
<constraint firstItem="ijg-ux-uvb" firstAttribute="leading" secondItem="CPP-lh-FbN" secondAttribute="trailing" constant="20" id="Fk2-g3-kkn"/>
<constraint firstItem="dY9-5D-mXX" firstAttribute="leading" secondItem="gzq-SL-YVY" secondAttribute="leading" id="GwZ-V8-Dqc"/>
@@ -644,16 +626,13 @@ This setting is no longer supported and may be removed in a future version. Use
<constraint firstItem="FHY-Ih-1rd" firstAttribute="trailing" secondItem="oJk-ur-wgc" secondAttribute="trailing" id="lxq-Ja-WBX"/>
<constraint firstItem="BY1-IG-JvI" firstAttribute="leading" secondItem="dY9-5D-mXX" secondAttribute="leading" id="oNW-bu-AjP"/>
<constraint firstItem="CPP-lh-FbN" firstAttribute="baseline" secondItem="ijg-ux-uvb" secondAttribute="baseline" id="oZ8-v8-CmD"/>
- <constraint firstItem="mkM-81-g3d" firstAttribute="baseline" secondItem="Zs7-1Y-50A" secondAttribute="baseline" id="omV-G5-hMn"/>
<constraint firstItem="Biw-5K-pPD" firstAttribute="width" secondItem="P7c-Zk-G99" secondAttribute="width" id="pJk-eY-1r2"/>
- <constraint firstItem="Zs7-1Y-50A" firstAttribute="leading" secondItem="mkM-81-g3d" secondAttribute="trailing" constant="8" id="qe2-wu-PNj"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Zs7-1Y-50A" secondAttribute="trailing" constant="20" symbolic="YES" id="riE-Nn-yRP"/>
<constraint firstItem="0sa-ep-yfr" firstAttribute="leading" secondItem="mkM-81-g3d" secondAttribute="leading" constant="40" id="sdR-pt-ls6"/>
<constraint firstItem="oJk-ur-wgc" firstAttribute="leading" secondItem="ijg-ux-uvb" secondAttribute="trailing" constant="8" id="wsw-IM-Ooe"/>
<constraint firstItem="0sa-ep-yfr" firstAttribute="width" secondItem="dY9-5D-mXX" secondAttribute="width" id="xvU-on-9bJ"/>
<constraint firstItem="ijg-ux-uvb" firstAttribute="leading" secondItem="P7c-Zk-G99" secondAttribute="trailing" constant="20" id="zKk-dV-w0d"/>
</constraints>
- <point key="canvasLocation" x="166" y="479"/>
+ <point key="canvasLocation" x="-130" y="483"/>
</customView>
<customView id="aRi-vN-oR0" userLabel="ffmpeg presets view">
<rect key="frame" x="0.0" y="0.0" width="920" height="34"/>
diff --git a/macosx/HBAdvancedController.h b/macosx/HBAdvancedController.h
index f2f8714cb..d0714ebd7 100644
--- a/macosx/HBAdvancedController.h
+++ b/macosx/HBAdvancedController.h
@@ -15,6 +15,4 @@
@property (nonatomic, readwrite, weak) HBVideo *videoSettings;
-@property (nonatomic, readwrite, getter=isHidden) BOOL hidden;
-@property (nonatomic, readwrite, getter=isEnabled) BOOL enabled;
@end
diff --git a/macosx/HBAdvancedController.m b/macosx/HBAdvancedController.m
index 2bd81b198..1d38a1e00 100644
--- a/macosx/HBAdvancedController.m
+++ b/macosx/HBAdvancedController.m
@@ -10,14 +10,6 @@
@interface HBAdvancedController ()
{
- /* Advanced Tab for opts fX264optView*/
- IBOutlet NSBox * fOptionsBox;
-
- IBOutlet NSView * fEmptyView;
-
- IBOutlet NSView * fX264optView;
- IBOutlet NSTextField * fX264optViewTitleLabel;
- IBOutlet NSTextField * fDisplayX264OptionsLabel;
IBOutlet NSTextField * fDisplayX264Options;
IBOutlet NSTextField * fX264optBframesLabel;
@@ -59,6 +51,8 @@
IBOutlet NSTextField * fX264optBAdaptLabel;
}
+@property (nonatomic, readwrite) HBVideo *internalVideoSettings;
+
- (IBAction) X264AdvancedOptionsAnimate: (id) sender;
- (IBAction) X264AdvancedOptionsSet: (id) sender;
- (IBAction) X264AdvancedOptionsStandardizeOptString: (id) sender;
@@ -73,28 +67,37 @@
@implementation HBAdvancedController
-@synthesize enabled = _enabled;
-
- (instancetype)init
{
self = [super initWithNibName:@"AdvancedView" bundle:nil];
- if (self)
- {
-
- }
-
return self;
}
- (void)viewDidLoad
{
[super viewDidLoad];
- [self setHidden:NO];
+
+ fDisplayX264Options.stringValue = _videoSettings.unparseOptions;
+ [self X264AdvancedOptionsSet:nil];
+}
+
+- (IBAction)ok:(id)sender
+{
+ HBVideo *video = self.videoSettings;
+ video.preset = @"medium";
+ video.tune = @"";
+ video.profile = @"auto";
+ video.level = @"auto";
+ video.fastDecode = NO;
+ video.videoOptionExtra = self.internalVideoSettings.videoOptionExtra;
+
+ [self dismissViewController:self];
}
- (void)setVideoSettings:(HBVideo *)videoSettings
{
_videoSettings = videoSettings;
+ self.internalVideoSettings = [videoSettings copy];
if (_videoSettings)
{
@@ -107,52 +110,6 @@
[self X264AdvancedOptionsSet:nil];
}
-- (void)setHidden:(BOOL)hidden
-{
- if (hidden)
- {
- [fOptionsBox setContentView:fEmptyView];
- }
- else
- {
- [fOptionsBox setContentView:fX264optView];
- }
-}
-
- - (void)setEnabled:(BOOL)flag
-{
- _enabled = flag;
-
- unsigned i;
- NSControl * controls[] =
- { fX264optViewTitleLabel,fDisplayX264Options,fDisplayX264OptionsLabel,fX264optBframesLabel,
- fX264optBframesPopUp,fX264optRefLabel,fX264optRefPopUp,
- fX264optNodctdcmtLabel,fX264optNodctdcmtSwitch,fX264optSubmeLabel,fX264optSubmePopUp,
- fX264optTrellisLabel,fX264optTrellisPopUp, fX264optWeightPLabel, fX264optWeightPSwitch,
- fX264optMotionEstLabel,fX264optMotionEstPopUp,fX264optMERangeLabel,fX264optMERangePopUp,
- fX264optBPyramidLabel,fX264optBPyramidPopUp, fX264optAqLabel, fX264optAqSlider,
- fX264optDirectPredLabel,fX264optDirectPredPopUp,fX264optDeblockLabel,fX264optAnalyseLabel,
- fX264optAnalysePopUp,fX264opt8x8dctLabel,fX264opt8x8dctSwitch,fX264optCabacLabel,fX264optCabacSwitch,
- fX264optAlphaDeblockPopUp,fX264optBetaDeblockPopUp, fX264optPsyRDSlider, fX264optPsyRDLabel, fX264optPsyTrellisSlider, fX264optPsyTrellisLabel, fX264optBAdaptPopUp, fX264optBAdaptLabel };
-
- for( i = 0; i < sizeof( controls ) / sizeof( NSControl * ); i++ )
- {
- if( [[controls[i] className] isEqualToString: @"NSTextField"] )
- {
- NSTextField * tf = (NSTextField *) controls[i];
- if( ![tf isBezeled] )
- {
- [tf setTextColor: flag ? [NSColor controlTextColor] :
- [NSColor disabledControlTextColor]];
- continue;
- }
- }
- [controls[i] setEnabled: flag];
-
- }
-}
-
-
/**
* Populates the option widgets
*/
@@ -462,7 +419,7 @@
/* Change the option string to reflect the new standardized option string */
[fDisplayX264Options setStringValue:changedOptString];
- self.videoSettings.videoOptionExtra = changedOptString;
+ self.internalVideoSettings.videoOptionExtra = changedOptString;
}
/**
@@ -1401,7 +1358,7 @@
/* We now need to reset the opt widgets since we changed some stuff */
[self X264AdvancedOptionsSet:sender];
- self.videoSettings.videoOptionExtra = fDisplayX264Options.stringValue;
+ self.internalVideoSettings.videoOptionExtra = fDisplayX264Options.stringValue;
}
@end
diff --git a/macosx/HBController.m b/macosx/HBController.m
index dec7906ee..379424e5e 100644
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -22,7 +22,6 @@
#import "HBVideoController.h"
#import "HBAudioController.h"
#import "HBSubtitlesController.h"
-#import "HBAdvancedController.h"
#import "HBChapterTitlesController.h"
#import "HBPreviewController.h"
@@ -34,7 +33,6 @@
@import HandBrakeKit;
-static void *HBControllerContext = &HBControllerContext;
static void *HBControllerScanCoreContext = &HBControllerScanCoreContext;
static void *HBControllerQueueCoreContext = &HBControllerQueueCoreContext;
@@ -66,10 +64,6 @@ static void *HBControllerQueueCoreContext = &HBControllerQueueCoreContext;
HBChapterTitlesController * fChapterTitlesController;
IBOutlet NSTabViewItem * fChaptersTitlesTab;
- // Advanced options tab
- HBAdvancedController * fAdvancedOptions;
- IBOutlet NSTabViewItem * fAdvancedTab;
-
// Picture Preview
HBPreviewController * fPreviewController;
@@ -256,12 +250,8 @@ static void *HBControllerQueueCoreContext = &HBControllerQueueCoreContext;
fAudioController = [[HBAudioController alloc] init];
[fAudioTab setView:[fAudioController view]];
- // setup the advanced view controller
- fAdvancedOptions = [[HBAdvancedController alloc] init];
- [fAdvancedTab setView:[fAdvancedOptions view]];
-
// setup the video view controller
- fVideoController = [[HBVideoController alloc] initWithAdvancedController:fAdvancedOptions];
+ fVideoController = [[HBVideoController alloc] init];
[fVideoTab setView:[fVideoController view]];
// setup the picture view controller
@@ -272,11 +262,6 @@ static void *HBControllerQueueCoreContext = &HBControllerQueueCoreContext;
fFiltersViewController = [[HBFiltersViewController alloc] init];
[fFiltersTab setView:[fFiltersViewController view]];
- [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
- forKeyPath:@"values.HBShowAdvancedTab"
- options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial
- context:HBControllerContext];
-
[self.core addObserver:self forKeyPath:@"state"
options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial
context:HBControllerScanCoreContext];
@@ -343,18 +328,7 @@ static void *HBControllerQueueCoreContext = &HBControllerQueueCoreContext;
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
{
- if (context == HBControllerContext && [keyPath isEqualToString:@"values.HBShowAdvancedTab"])
- {
- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"HBShowAdvancedTab"] && ![[fMainTabView tabViewItems] containsObject:fAdvancedTab])
- {
- [fMainTabView insertTabViewItem:fAdvancedTab atIndex:5];
- }
- else
- {
- [fMainTabView removeTabViewItem:fAdvancedTab];
- }
- }
- else if (context == HBControllerScanCoreContext)
+ if (context == HBControllerScanCoreContext)
{
HBState state = [change[NSKeyValueChangeNewKey] intValue];
[self updateToolbarButtonsStateForScanCore:state];
@@ -1546,16 +1520,17 @@ static NSTouchBarItemIdentifier HBTouchBarAddTitlesToQueue = @"fr.handbrake.addT
static NSTouchBarItemIdentifier HBTouchBarRip = @"fr.handbrake.rip";
static NSTouchBarItemIdentifier HBTouchBarPause = @"fr.handbrake.pause";
static NSTouchBarItemIdentifier HBTouchBarPreview = @"fr.handbrake.preview";
+static NSTouchBarItemIdentifier HBTouchBarActivity = @"fr.handbrake.activity";
- (NSTouchBar *)makeTouchBar
{
NSTouchBar *bar = [[NSTouchBar alloc] init];
bar.delegate = self;
- bar.defaultItemIdentifiers = @[HBTouchBarOpen, NSTouchBarItemIdentifierFixedSpaceSmall, HBTouchBarAddToQueue, NSTouchBarItemIdentifierFixedSpaceLarge, HBTouchBarRip, HBTouchBarPause, NSTouchBarItemIdentifierFixedSpaceLarge, HBTouchBarPreview, NSTouchBarItemIdentifierOtherItemsProxy];
+ bar.defaultItemIdentifiers = @[HBTouchBarOpen, NSTouchBarItemIdentifierFixedSpaceSmall, HBTouchBarAddToQueue, NSTouchBarItemIdentifierFixedSpaceLarge, HBTouchBarRip, HBTouchBarPause, NSTouchBarItemIdentifierFixedSpaceLarge, HBTouchBarPreview, HBTouchBarActivity, NSTouchBarItemIdentifierOtherItemsProxy];
bar.customizationIdentifier = HBTouchBarMain;
- bar.customizationAllowedItemIdentifiers = @[HBTouchBarOpen, HBTouchBarAddToQueue, HBTouchBarAddTitlesToQueue, HBTouchBarRip, HBTouchBarPause, HBTouchBarPreview, NSTouchBarItemIdentifierFixedSpaceSmall, NSTouchBarItemIdentifierFixedSpaceLarge, NSTouchBarItemIdentifierFlexibleSpace];
+ bar.customizationAllowedItemIdentifiers = @[HBTouchBarOpen, HBTouchBarAddToQueue, HBTouchBarAddTitlesToQueue, HBTouchBarRip, HBTouchBarPause, HBTouchBarPreview, HBTouchBarActivity, NSTouchBarItemIdentifierFixedSpaceSmall, NSTouchBarItemIdentifierFixedSpaceLarge, NSTouchBarItemIdentifierFlexibleSpace];
return bar;
}
@@ -1622,6 +1597,16 @@ static NSTouchBarItemIdentifier HBTouchBarPreview = @"fr.handbrake.preview";
item.view = button;
return item;
}
+ else if ([identifier isEqualTo:HBTouchBarActivity])
+ {
+ NSCustomTouchBarItem *item = [[NSCustomTouchBarItem alloc] initWithIdentifier:identifier];
+ item.customizationLabel = NSLocalizedString(@"Show Activity Window", @"Touch bar");
+
+ NSButton *button = [NSButton buttonWithImage:[NSImage imageNamed:NSImageNameTouchBarGetInfoTemplate] target:nil action:@selector(showOutputPanel:)];
+
+ item.view = button;
+ return item;
+ }
return nil;
}
diff --git a/macosx/HBJob+HBJobConversion.m b/macosx/HBJob+HBJobConversion.m
index ecef901e0..151e2ed8c 100644
--- a/macosx/HBJob+HBJobConversion.m
+++ b/macosx/HBJob+HBJobConversion.m
@@ -141,35 +141,26 @@
const char *encoder_options = NULL;
const char *encoder_profile = NULL;
const char *encoder_level = NULL;
- if (self.video.advancedOptions)
+
+ // we are using the x264/x265 preset system
+ if ([(tmpString = self.video.completeTune) length])
{
- // we are using the advanced panel
- if ([(tmpString = self.video.videoOptionExtra) length])
- {
- encoder_options = tmpString.UTF8String;
- }
+ encoder_tune = [tmpString UTF8String];
}
- else
+ if ([(tmpString = self.video.videoOptionExtra) length])
{
- // we are using the x264/x265 preset system
- if ([(tmpString = self.video.completeTune) length])
- {
- encoder_tune = [tmpString UTF8String];
- }
- if ([(tmpString = self.video.videoOptionExtra) length])
- {
- encoder_options = [tmpString UTF8String];
- }
- if ([(tmpString = self.video.profile) length])
- {
- encoder_profile = [tmpString UTF8String];
- }
- if ([(tmpString = self.video.level) length])
- {
- encoder_level = [tmpString UTF8String];
- }
- encoder_preset = self.video.preset.UTF8String;
+ encoder_options = [tmpString UTF8String];
+ }
+ if ([(tmpString = self.video.profile) length])
+ {
+ encoder_profile = [tmpString UTF8String];
+ }
+ if ([(tmpString = self.video.level) length])
+ {
+ encoder_level = [tmpString UTF8String];
}
+ encoder_preset = self.video.preset.UTF8String;
+
hb_job_set_encoder_preset (job, encoder_preset);
hb_job_set_encoder_tune (job, encoder_tune);
hb_job_set_encoder_options(job, encoder_options);
diff --git a/macosx/HBJob+UIAdditions.m b/macosx/HBJob+UIAdditions.m
index f8b273804..467b92c51 100644
--- a/macosx/HBJob+UIAdditions.m
+++ b/macosx/HBJob+UIAdditions.m
@@ -435,53 +435,39 @@ static NSDictionary *shortHeightAttr;
{
NSMutableString *encoderPresetInfo = [NSMutableString string];
- if (self.video.advancedOptions)
+ // we are using the x264 system
+ [encoderPresetInfo appendFormat:HBKitLocalizedString(@"Preset: %@", @"Video description"), self.video.preset];
+
+ if (self.video.tune.length || self.video.fastDecode)
{
- // we are using the old advanced panel
- if (self.video.videoOptionExtra.length)
+ [encoderPresetInfo appendString:@", "];
+ [encoderPresetInfo appendString:HBKitLocalizedString(@"Tune: ", @"Video description")];
+
+ if (self.video.tune.length)
{
- [encoderPresetInfo appendString:self.video.videoOptionExtra];
+ [encoderPresetInfo appendString:self.video.tune];
}
- else
+ if (self.video.fastDecode)
{
- [encoderPresetInfo appendString:HBKitLocalizedString(@"default settings", @"Video description")];
+ [encoderPresetInfo appendString:HBKitLocalizedString(@" - fastdecode", @"Video description")];
}
}
- else
+ if (self.video.videoOptionExtra.length)
{
- // we are using the x264 system
- [encoderPresetInfo appendFormat:HBKitLocalizedString(@"Preset: %@", @"Video description"), self.video.preset];
-
- if (self.video.tune.length || self.video.fastDecode)
- {
- [encoderPresetInfo appendString:@", "];
- [encoderPresetInfo appendString:HBKitLocalizedString(@"Tune: ", @"Video description")];
-
- if (self.video.tune.length)
- {
- [encoderPresetInfo appendString:self.video.tune];
- }
- if (self.video.fastDecode)
- {
- [encoderPresetInfo appendString:HBKitLocalizedString(@" - fastdecode", @"Video description")];
- }
- }
- if (self.video.videoOptionExtra.length)
- {
- [encoderPresetInfo appendString:@", "];
- [encoderPresetInfo appendFormat:HBKitLocalizedString(@"Options: %@", @"Video description"), self.video.videoOptionExtra];
- }
- if (self.video.profile.length)
- {
- [encoderPresetInfo appendString:@", "];
- [encoderPresetInfo appendFormat:HBKitLocalizedString(@"Profile: %@", @"Video description"), self.video.profile];
- }
- if (self.video.level.length)
- {
- [encoderPresetInfo appendString:@", "];
- [encoderPresetInfo appendFormat:HBKitLocalizedString(@"Level: %@", @"Video description"), self.video.level];
- }
+ [encoderPresetInfo appendString:@", "];
+ [encoderPresetInfo appendFormat:HBKitLocalizedString(@"Options: %@", @"Video description"), self.video.videoOptionExtra];
+ }
+ if (self.video.profile.length)
+ {
+ [encoderPresetInfo appendString:@", "];
+ [encoderPresetInfo appendFormat:HBKitLocalizedString(@"Profile: %@", @"Video description"), self.video.profile];
}
+ if (self.video.level.length)
+ {
+ [encoderPresetInfo appendString:@", "];
+ [encoderPresetInfo appendFormat:HBKitLocalizedString(@"Level: %@", @"Video description"), self.video.level];
+ }
+
[attrString appendString:@"\t" withAttributes:detailAttr];
[attrString appendString:HBKitLocalizedString(@"Video Options:", @"Video description") withAttributes:detailBoldAttr];
[attrString appendString:@" \t" withAttributes:detailAttr];
diff --git a/macosx/HBVideo.h b/macosx/HBVideo.h
index d259f011c..8f3647123 100644
--- a/macosx/HBVideo.h
+++ b/macosx/HBVideo.h
@@ -44,7 +44,6 @@ extern NSString * const HBVideoChangedNotification;
* Encoder specifics options
*/
-@property (nonatomic, readwrite) BOOL advancedOptions;
@property (nonatomic, readwrite, copy) NSString *preset;
@property (nonatomic, readwrite, copy) NSString *tune;
@property (nonatomic, readwrite, copy) NSString *profile;
diff --git a/macosx/HBVideo.m b/macosx/HBVideo.m
index 2df476165..15c2f67ae 100644
--- a/macosx/HBVideo.m
+++ b/macosx/HBVideo.m
@@ -106,7 +106,6 @@ NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification";
if (!(self.undo.isUndoing || self.undo.isRedoing))
{
[self validatePresetsSettings];
- [self validateAdvancedOptions];
[self validateVideoOptionExtra:previousEncoder];
}
@@ -305,14 +304,6 @@ NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification";
}
}
-- (void)validateAdvancedOptions
-{
- if (self.encoder != HB_VCODEC_H264_MASK)
- {
- self.advancedOptions = NO;
- }
-}
-
- (void)validateVideoOptionExtra:(int)previousEncoder
{
if (!((previousEncoder & HB_VCODEC_X264_MASK &&
@@ -445,7 +436,6 @@ NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification";
copy->_twoPass = _twoPass;
copy->_turboTwoPass = _turboTwoPass;
- copy->_advancedOptions = _advancedOptions;
copy->_preset = [_preset copy];
copy->_tune = [_tune copy];
copy->_profile = [_profile copy];
@@ -468,7 +458,7 @@ NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification";
- (void)encodeWithCoder:(NSCoder *)coder
{
- [coder encodeInt:1 forKey:@"HBVideoVersion"];
+ [coder encodeInt:2 forKey:@"HBVideoVersion"];
encodeInt(_encoder);
@@ -485,7 +475,6 @@ NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification";
encodeBool(_twoPass);
encodeBool(_turboTwoPass);
- encodeBool(_advancedOptions);
encodeObject(_preset);
encodeObject(_tune);
encodeObject(_profile);
@@ -515,7 +504,6 @@ NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification";
decodeBool(_twoPass);
decodeBool(_turboTwoPass);
- decodeBool(_advancedOptions);
decodeObjectOrFail(_preset, NSString);
decodeObjectOrFail(_tune, NSString);
decodeObjectOrFail(_profile, NSString);
@@ -591,14 +579,12 @@ fail:
self.fastDecode = NO;
self.videoOptionExtra = preset[@"VideoOptionExtra"];
- self.advancedOptions = YES;
}
else
{
// x264UseAdvancedOptions is set to 0 (disabled),
// so we use the new preset system and
// disable the advanced panel
- self.advancedOptions = NO;
self.preset = preset[@"VideoPreset"];
self.tune = preset[@"VideoTune"];
@@ -693,17 +679,7 @@ fail:
preset[@"VideoOptionExtra"] = self.videoOptionExtra;
preset[@"VideoProfile"] = self.profile;
preset[@"VideoLevel"] = self.level;
-
- // x264 Options, this will either be advanced panel or the video tabs x264 presets panel with modded option string
- if (self.advancedOptions)
- {
- // use the old advanced panel.
- preset[@"x264UseAdvancedOptions"] = @YES;
- }
- else
- {
- preset[@"x264UseAdvancedOptions"] = @NO;
- }
+ preset[@"x264UseAdvancedOptions"] = @NO;
}
else
{
diff --git a/macosx/HBVideoController.h b/macosx/HBVideoController.h
index 486b44c48..937563575 100644
--- a/macosx/HBVideoController.h
+++ b/macosx/HBVideoController.h
@@ -6,7 +6,6 @@
#import <Cocoa/Cocoa.h>
-@class HBAdvancedController;
@class HBVideo;
/**
@@ -14,8 +13,6 @@
*/
@interface HBVideoController : NSViewController
-- (instancetype)initWithAdvancedController:(HBAdvancedController *)advancedController;
-
@property (nonatomic, readwrite, weak) HBVideo *video;
@end
diff --git a/macosx/HBVideoController.m b/macosx/HBVideoController.m
index baca2b0c1..9a99719a5 100644
--- a/macosx/HBVideoController.m
+++ b/macosx/HBVideoController.m
@@ -25,8 +25,6 @@ static void *HBVideoControllerContext = &HBVideoControllerContext;
IBOutlet NSTextField *fEncoderOptionsLabel;
// x264/x265 Presets Box
- IBOutlet NSButton *fX264UseAdvancedOptionsCheck;
- IBOutlet NSBox *fDividerLine;
IBOutlet NSBox *fPresetsBox;
IBOutlet NSSlider *fPresetsSlider;
@@ -34,26 +32,15 @@ static void *HBVideoControllerContext = &HBVideoControllerContext;
IBOutlet NSTextField *fDisplayX264PresetsUnparseTextField;
}
-@property (nonatomic, strong, readwrite) HBAdvancedController *advancedController;
+@property (nonatomic, weak) IBOutlet NSTextField *additionalsOptions;
-@property (nonatomic, readwrite) BOOL presetViewEnabled;
-
-@property (nonatomic, readwrite) NSColor *labelColor;
+@property (nonatomic) BOOL presetViewEnabled;
+@property (nonatomic) NSColor *labelColor;
@end
@implementation HBVideoController
-- (instancetype)initWithAdvancedController:(HBAdvancedController *)advancedController
-{
- self = [self init];
- if (self)
- {
- _advancedController = advancedController;
- }
- return self;
-}
-
- (instancetype)init
{
self = [super initWithNibName:@"Video" bundle:nil];
@@ -85,6 +72,51 @@ static void *HBVideoControllerContext = &HBVideoControllerContext;
return self;
}
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+{
+ SEL action = menuItem.action;
+
+ if (action == @selector(showAdvancedX264Panel:))
+ {
+ return [self.video isOldAdvancedPanelSupported:self.video.encoder];
+ }
+ return [self.nextResponder validateMenuItem:menuItem];
+}
+
+- (void)viewDidAppear
+{
+ NSText *defaultFieldEditor = [self.view.window fieldEditor:YES forObject:self.additionalsOptions];
+ // defaultEditor.delegate = self; didn't help
+ NSMenu *mu = defaultFieldEditor.menu;
+ NSMenuItem *separator = [NSMenuItem separatorItem];
+ separator.tag = 1;
+ NSMenuItem *action = [[NSMenuItem alloc]
+ initWithTitle:NSLocalizedString(@"Show advanced editor", @"Video -> Advanced editor")
+ action:@selector(showAdvancedX264Panel:)
+ keyEquivalent:@""];
+ action.tag = 2;
+ action.enabled = YES;
+ [mu insertItem:separator atIndex:0];
+ [mu insertItem:action atIndex:0];
+}
+
+- (void)viewWillDisappear
+{
+ NSText *defaultFieldEditor = [self.view.window fieldEditor:YES forObject:self.additionalsOptions];
+ NSMenu *mu = defaultFieldEditor.menu;
+ NSMenuItem *separator = [mu itemWithTag:1];
+ NSMenuItem *action = [mu itemWithTag:2];
+ if (separator) { [mu removeItem:separator]; }
+ if (action) { [mu removeItem:action]; }
+}
+
+- (IBAction)showAdvancedX264Panel:(id)sender
+{
+ HBAdvancedController *controller = [[HBAdvancedController alloc] init];
+ controller.videoSettings = self.video;
+ [self presentViewControllerAsSheet:controller];
+}
+
- (void)setVideo:(HBVideo *)video
{
_video = video;
@@ -145,27 +177,6 @@ static void *HBVideoControllerContext = &HBVideoControllerContext;
fDisplayX264PresetsUnparseTextField.stringValue = @"";
}
}
- else if ([keyPath isEqualToString:@"video.advancedOptions"])
- {
- if (self.video.advancedOptions)
- {
- // Do not enable the advanced panel it isn't visible.
- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"HBShowAdvancedTab"])
- {
- self.advancedController.videoSettings = self.video.advancedOptions ? self.video : nil;
- }
- else
- {
- self.video.advancedOptions = NO;
- }
- }
- // enable/disable, populate and update the various widgets
- [self enableEncoderOptionsWidgets:(self.video != nil)];
-
- } else if ([keyPath isEqualToString:@"values.HBShowAdvancedTab"])
- {
- [self toggleAdvancedOptionsCheckBoxForEncoder:self.video.encoder];
- }
else if ([keyPath isEqualToString:@"values.x264CqSliderFractional"])
{
[self setupQualitySlider];
@@ -215,19 +226,10 @@ static void *HBVideoControllerContext = &HBVideoControllerContext;
*/
- (void)switchPresetView
{
- self.advancedController.hidden = YES;
-
if ([self.video isPresetSystemSupported:self.video.encoder])
{
- [self toggleAdvancedOptionsCheckBoxForEncoder:self.video.encoder];
-
fPresetsBox.contentView = fPresetView;
[self setupPresetsSlider];
-
- if ([self.video isOldAdvancedPanelSupported:self.video.encoder])
- {
- self.advancedController.hidden = NO;
- }
}
else if ([self.video isSimpleOptionsPanelSupported:self.video.encoder])
{
@@ -244,35 +246,8 @@ static void *HBVideoControllerContext = &HBVideoControllerContext;
*/
- (void)enableEncoderOptionsWidgets:(BOOL)enable
{
- // check whether the x264 preset system and the advanced panel should be enabled
- BOOL enable_x264_controls = (enable && !self.video.advancedOptions);
- BOOL enable_advanced_panel = (enable && self.video.advancedOptions);
-
// enable/disable the checkbox and advanced panel
- self.presetViewEnabled = enable_x264_controls;
- self.advancedController.enabled = enable_advanced_panel;
-}
-
-/**
- * Shows/Hides the advanced options checkbox
- *
- * @param encoder the current encoder
- */
-- (void)toggleAdvancedOptionsCheckBoxForEncoder:(int)encoder
-{
- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"HBShowAdvancedTab"] && [self.video isOldAdvancedPanelSupported:self.video.encoder])
- {
- fX264UseAdvancedOptionsCheck.hidden = NO;
- fDividerLine.hidden = YES;
- fEncoderOptionsLabel.stringValue = NSLocalizedString(@"Encoder Options:", @"Video -> Advanced panel checkbox");
- }
- else
- {
- fX264UseAdvancedOptionsCheck.hidden =YES;
- fDividerLine.hidden = NO;
- fEncoderOptionsLabel.stringValue = NSLocalizedString(@"Encoder Options", @"Video -> Encoder options title");
- self.video.advancedOptions = NO;
- }
+ self.presetViewEnabled = enable;
}
/**
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 06:09:53 +0000