diff options
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/English.lproj/AudioDefaults.xib | 612 | ||||
| -rw-r--r-- | macosx/HBAudioDefaults.h | 2 | ||||
| -rw-r--r-- | macosx/HBAudioDefaults.m | 9 | ||||
| -rw-r--r-- | macosx/HBAudioDefaultsController.m | 8 | ||||
| -rw-r--r-- | macosx/HBAudioTrackPreset.h | 16 | ||||
| -rw-r--r-- | macosx/HBAudioTrackPreset.m | 40 |
6 files changed, 377 insertions, 310 deletions
diff --git a/macosx/English.lproj/AudioDefaults.xib b/macosx/English.lproj/AudioDefaults.xib index 96857dd31..0a736de80 100644 --- a/macosx/English.lproj/AudioDefaults.xib +++ b/macosx/English.lproj/AudioDefaults.xib @@ -1,9 +1,9 @@ <?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"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" 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="9059"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="HBAudioDefaultsController"> @@ -20,16 +20,16 @@ <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="kwM-lz-5lG"> <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> - <rect key="contentRect" x="175" y="825" width="813" height="442"/> + <rect key="contentRect" x="175" y="825" width="813" height="464"/> <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/> <value key="minSize" type="size" width="813" height="397"/> <value key="maxSize" type="size" width="813" height="600"/> <view key="contentView" id="ZP2-Cp-K5w"> - <rect key="frame" x="0.0" y="0.0" width="813" height="442"/> + <rect key="frame" x="0.0" y="0.0" width="813" height="464"/> <autoresizingMask key="autoresizingMask"/> <subviews> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="fPg-3n-1TN"> - <rect key="frame" x="10" y="406" width="145" height="14"/> + <rect key="frame" x="10" y="428" width="145" height="14"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <animations/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Track Selection Behavior:" id="GbM-vm-RC2"> @@ -39,7 +39,7 @@ </textFieldCell> </textField> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Jsz-Er-bsF"> - <rect key="frame" x="10" y="382" width="145" height="14"/> + <rect key="frame" x="10" y="404" width="145" height="14"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <animations/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Languages:" id="mAT-Jp-SG1"> @@ -48,18 +48,8 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Hqz-Lw-gAu"> - <rect key="frame" x="430" y="261" width="115" height="14"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <animations/> - <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Options:" id="NJl-q3-zXL"> - <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> <popUpButton verticalHuggingPriority="750" id="oiD-QI-wly"> - <rect key="frame" x="158" y="401" width="252" height="22"/> + <rect key="frame" x="158" y="423" width="252" height="22"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <animations/> <popUpButtonCell key="cell" type="push" title="None" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="mvw-Hg-JFM" id="21e-KY-8TR"> @@ -79,22 +69,8 @@ <outlet property="nextKeyView" destination="Of7-71-Ci6" id="jgQ-nK-YLu"/> </connections> </popUpButton> - <button id="uF5-6E-EIe"> - <rect key="frame" x="548" y="259" width="255" height="18"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <string key="toolTip">Only the primary audio track will be encoded with the full encoder list. All other secondary audio output tracks will be encoded with first encoder only.</string> - <animations/> - <buttonCell key="cell" type="check" title="Use only first encoder for secondary audio" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="66v-2g-DHn"> - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> - <font key="font" metaFont="smallSystem"/> - </buttonCell> - <connections> - <binding destination="-2" name="value" keyPath="self.settings.secondaryEncoderMode" id="Umc-CV-pJy"/> - <outlet property="nextKeyView" destination="r4m-GO-aN3" id="nUp-Ow-ZFS"/> - </connections> - </button> <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="aTC-39-h6S"> - <rect key="frame" x="161" y="261" width="246" height="135"/> + <rect key="frame" x="161" y="283" width="246" height="135"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <clipView key="contentView" id="TdE-Sh-NcS"> <rect key="frame" x="1" y="1" width="244" height="133"/> @@ -151,12 +127,12 @@ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> </clipView> <animations/> - <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="bXf-U5-ogz"> + <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="bXf-U5-ogz"> <rect key="frame" x="1" y="118" width="244" height="16"/> <autoresizingMask key="autoresizingMask"/> <animations/> </scroller> - <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="BWM-rq-VTg"> + <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="BWM-rq-VTg"> <autoresizingMask key="autoresizingMask"/> <animations/> </scroller> @@ -166,7 +142,7 @@ </connections> </scrollView> <button verticalHuggingPriority="750" id="QAt-5X-NBT"> - <rect key="frame" x="161" y="231" width="71" height="23"/> + <rect key="frame" x="161" y="253" width="71" height="23"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <animations/> <buttonCell key="cell" type="smallSquare" title="Show All" bezelStyle="smallSquare" imagePosition="overlaps" alignment="center" controlSize="small" borderStyle="border" inset="3" id="PiQ-bA-7P1"> @@ -196,7 +172,7 @@ DQ </connections> </button> <button id="vUx-OV-W5T"> - <rect key="frame" x="548" y="404" width="77" height="18"/> + <rect key="frame" x="548" y="402" width="77" height="18"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <string key="toolTip">Enable this if your playback device supports MP3. This permits MP3 passthru to be selected when automatic passthru selecion is enabled.</string> <animations/> @@ -211,7 +187,7 @@ DQ </connections> </button> <button id="fzd-MO-xaB"> - <rect key="frame" x="548" y="386" width="77" height="18"/> + <rect key="frame" x="548" y="384" width="77" height="18"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <string key="toolTip">Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selecion is enabled.</string> <animations/> @@ -226,7 +202,7 @@ DQ </connections> </button> <button id="fgl-Ev-ELt"> - <rect key="frame" x="548" y="368" width="77" height="18"/> + <rect key="frame" x="548" y="366" width="77" height="18"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <string key="toolTip">Enable this if your playback device supports AC3. This permits AC3 passthru to be selected when automatic passthru selecion is enabled.</string> <animations/> @@ -241,7 +217,7 @@ DQ </connections> </button> <button id="E93-Md-aWa"> - <rect key="frame" x="548" y="350" width="77" height="18"/> + <rect key="frame" x="548" y="348" width="77" height="18"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <string key="toolTip">Enable this if your playback device supports DTS. This permits DTS passthru to be selected when automatic passthru selecion is enabled.</string> <animations/> @@ -256,7 +232,7 @@ DQ </connections> </button> <button id="IxI-o9-jMs"> - <rect key="frame" x="548" y="332" width="77" height="18"/> + <rect key="frame" x="548" y="330" width="77" height="18"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <string key="toolTip">Enable this if your playback device supports DTS-HD. This permits DTS-HD passthru to be selected when automatic passthru selecion is enabled.</string> <animations/> @@ -271,7 +247,7 @@ DQ </connections> </button> <textField verticalHuggingPriority="750" id="l4i-pd-Cbk"> - <rect key="frame" x="430" y="406" width="115" height="14"/> + <rect key="frame" x="430" y="404" width="115" height="14"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <animations/> <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Auto Passthru:" id="s6s-EH-5CB"> @@ -281,7 +257,7 @@ DQ </textFieldCell> </textField> <popUpButton toolTip="Set the audio codec to encode with when a suitable track can not be found for audio passthru." verticalHuggingPriority="750" id="LdN-Cx-ZJY"> - <rect key="frame" x="548" y="285" width="152" height="22"/> + <rect key="frame" x="548" y="283" width="152" height="22"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <animations/> <popUpButtonCell key="cell" type="push" title="Item" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="UJy-A2-Bb1" id="OqD-Tf-29c"> @@ -296,16 +272,16 @@ DQ <connections> <accessibilityConnection property="title" destination="Tth-IR-7cU" id="eOb-bG-eUP"/> <binding destination="-2" name="content" keyPath="self.settings.audioEncoderFallbacks" id="cP2-Bo-45S"/> - <binding destination="-2" name="selectedValue" keyPath="self.settings.encoderFallback" previousBinding="cP2-Bo-45S" id="njJ-qO-UAy"> + <binding destination="-2" name="selectedValue" keyPath="self.settings.encoderFallback" previousBinding="cP2-Bo-45S" id="beq-vk-V2B"> <dictionary key="options"> - <string key="NSValueTransformerName">HBEncoderTrasformer</string> + <string key="NSValueTransformerName">HBEncoderTransformer</string> </dictionary> </binding> <outlet property="nextKeyView" destination="uF5-6E-EIe" id="gaK-Cr-XA9"/> </connections> </popUpButton> <textField verticalHuggingPriority="750" id="Tth-IR-7cU"> - <rect key="frame" x="430" y="290" width="115" height="14"/> + <rect key="frame" x="430" y="288" width="115" height="14"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <animations/> <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Passthru Fallback:" id="AQe-Sg-Qgh"> @@ -314,211 +290,357 @@ DQ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <scrollView autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="dWE-zD-izv"> - <rect key="frame" x="20" y="46" width="773" height="144"/> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="RtZ-Cz-5mG"> + <rect key="frame" x="18" y="220" width="253" height="14"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <animations/> + <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Audio encoder settings for each selected track:" id="007-WM-RmC"> + <font key="font" metaFont="smallSystem"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> + <segmentedControl verticalHuggingPriority="750" id="N4q-sT-WgW"> + <rect key="frame" x="18" y="41" width="54" height="20"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <animations/> + <segmentedCell key="cell" controlSize="small" borderStyle="border" alignment="left" style="rounded" trackingMode="momentary" id="otA-K4-TxM"> + <font key="font" metaFont="smallSystem"/> + <segments> + <segment toolTip="Add Preset Track" image="NSAddTemplate" width="24"> + <nil key="label"/> + </segment> + <segment toolTip="Remove Selected Preset Track" image="NSRemoveTemplate" width="23" tag="1"> + <nil key="label"/> + </segment> + </segments> + </segmentedCell> + <connections> + <action selector="addTrack:" target="-2" id="vsd-5z-3e3"/> + <outlet property="nextKeyView" destination="sC2-52-liU" id="mmR-bd-cFG"/> + </connections> + </segmentedControl> + <button id="os0-Jl-OXF"> + <rect key="frame" x="650" y="402" width="77" height="18"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <string key="toolTip">Enable this if your playback device supports TrueHD. This permits TrueHD passthru to be selected when automatic passthru selecion is enabled.</string> + <animations/> + <buttonCell key="cell" type="check" title="TrueHD" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="z9d-P3-6UP"> + <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> + <font key="font" metaFont="smallSystem"/> + </buttonCell> + <connections> + <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="tU2-ar-p5a"/> + <binding destination="-2" name="value" keyPath="self.settings.allowTrueHDPassthru" id="3fh-cT-PtB"/> + <outlet property="nextKeyView" destination="0HY-xB-cvO" id="TYi-8L-gT4"/> + </connections> + </button> + <button id="0HY-xB-cvO"> + <rect key="frame" x="650" y="384" width="77" height="18"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <string key="toolTip">Enable this if your playback device supports FLAC. This permits FLAC passthru to be selected when automatic passthru selecion is enabled.</string> + <animations/> + <buttonCell key="cell" type="check" title="FLAC" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="naS-No-CdV"> + <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> + <font key="font" metaFont="smallSystem"/> + </buttonCell> + <connections> + <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="SFz-OO-EgN"/> + <binding destination="-2" name="value" keyPath="self.settings.allowFLACPassthru" id="wCD-CW-AEP"/> + <outlet property="nextKeyView" destination="BK7-c4-kkk" id="Pt4-9c-oQl"/> + </connections> + </button> + <button id="BK7-c4-kkk"> + <rect key="frame" x="650" y="366" width="77" height="18"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <string key="toolTip">Enable this if your playback device supports EAC3. This permits EAC3 passthru to be selected when automatic passthru selecion is enabled.</string> + <animations/> + <buttonCell key="cell" type="check" title="EAC3" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="u9h-dn-wcK"> + <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> + <font key="font" metaFont="smallSystem"/> + </buttonCell> + <connections> + <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="83N-qg-BsJ"/> + <binding destination="-2" name="value" keyPath="self.settings.allowEAC3Passthru" id="vcL-wd-H1f"/> + <outlet property="nextKeyView" destination="LdN-Cx-ZJY" id="scB-D1-Zvp"/> + </connections> + </button> + <scrollView focusRingType="exterior" autohidesScrollers="YES" horizontalLineScroll="26" horizontalPageScroll="10" verticalLineScroll="26" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="hGL-Ew-UVJ"> + <rect key="frame" x="20" y="69" width="773" height="143"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <clipView key="contentView" id="ocp-4z-kPU"> - <rect key="frame" x="1" y="17" width="771" height="126"/> + <clipView key="contentView" id="jkU-Fi-GCv"> + <rect key="frame" x="1" y="23" width="771" height="119"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="25" headerView="X9E-z1-8Hv" id="r4m-GO-aN3"> - <rect key="frame" x="0.0" y="0.0" width="771" height="27"/> + <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="24" rowSizeStyle="automatic" headerView="IbE-bD-EWJ" viewBased="YES" id="ZsG-T1-vGv"> + <rect key="frame" x="0.0" y="0.0" width="771" height="119"/> <autoresizingMask key="autoresizingMask"/> <animations/> <size key="intercellSpacing" width="3" height="2"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> <tableColumns> - <tableColumn identifier="codec" width="275" minWidth="10" maxWidth="3.4028229999999999e+38" id="LuF-er-YPm"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Codec"> + <tableColumn width="273" minWidth="143" maxWidth="1000" id="pR9-d4-SNf"> + <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Codec"> <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> </tableHeaderCell> - <popUpButtonCell key="dataCell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="eC3-fz-8ff"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="smallSystem"/> - <menu key="menu" title="OtherViews" id="vJx-U4-Kqn"> - <items> - <menuItem title="Pop Up" id="L04-Mv-X9t"/> - </items> - </menu> - </popUpButtonCell> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="uFK-z7-8Yj"> + <font key="font" metaFont="system"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <connections> - <binding destination="I6S-EX-Dvu" name="selectedValue" keyPath="arrangedObjects.encoder" previousBinding="3FH-yz-dQp" id="fdo-7w-Lke"> - <dictionary key="options"> - <string key="NSValueTransformerName">HBEncoderTrasformer</string> - </dictionary> - </binding> - <binding destination="I6S-EX-Dvu" name="content" keyPath="arrangedObjects.encoders" id="3FH-yz-dQp"/> - </connections> + <prototypeCellViews> + <tableCellView id="UBy-AR-7XQ"> + <rect key="frame" x="1" y="1" width="273" height="24"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <popUpButton verticalHuggingPriority="750" id="6lx-af-rBL"> + <rect key="frame" x="0.0" y="0.0" width="273" height="22"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> + <animations/> + <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="t8s-X1-tQV"> + <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="smallSystem"/> + <menu key="menu" id="3Re-GO-fwv"/> + </popUpButtonCell> + <connections> + <binding destination="UBy-AR-7XQ" name="selectedValue" keyPath="objectValue.encoder" previousBinding="e1c-VC-o3V" id="jXp-yy-HhF"> + <dictionary key="options"> + <string key="NSValueTransformerName">HBEncoderTransformer</string> + </dictionary> + </binding> + <binding destination="UBy-AR-7XQ" name="content" keyPath="objectValue.encoders" id="e1c-VC-o3V"/> + </connections> + </popUpButton> + </subviews> + <animations/> + </tableCellView> + </prototypeCellViews> </tableColumn> - <tableColumn identifier="mixdown" width="146" minWidth="10" maxWidth="3.4028229999999999e+38" id="569-7O-ycq"> + <tableColumn width="151" minWidth="128" maxWidth="3.4028234663852886e+38" id="0kT-0J-3k2"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Mixdown"> <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableHeaderCell> - <popUpButtonCell key="dataCell" type="push" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="JZe-ew-UW6" id="U3S-VF-Osh"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="smallSystem"/> - <menu key="menu" title="OtherViews" id="iFd-Xx-1fd"> - <items> - <menuItem title="Pop Up" state="on" id="JZe-ew-UW6"/> - </items> - </menu> - </popUpButtonCell> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="1XC-VS-X3g"> + <font key="font" metaFont="system"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <connections> - <binding destination="I6S-EX-Dvu" name="selectedValue" keyPath="arrangedObjects.mixdown" previousBinding="M17-dt-S1h" id="jRj-iF-7Dx"> - <dictionary key="options"> - <string key="NSValueTransformerName">HBMixdownTrasformer</string> - </dictionary> - </binding> - <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.mixdownEnabled" id="QcL-GI-fNW"/> - <binding destination="I6S-EX-Dvu" name="content" keyPath="arrangedObjects.mixdowns" id="M17-dt-S1h"/> - </connections> + <prototypeCellViews> + <tableCellView id="uS1-Fd-V9I"> + <rect key="frame" x="277" y="1" width="151" height="24"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <popUpButton verticalHuggingPriority="750" id="igm-hS-rrD"> + <rect key="frame" x="0.0" y="0.0" width="151" height="22"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> + <animations/> + <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="2JY-Ie-KSg"> + <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="smallSystem"/> + <menu key="menu" id="cKk-6o-udN"/> + </popUpButtonCell> + <connections> + <binding destination="uS1-Fd-V9I" name="selectedValue" keyPath="objectValue.mixdown" previousBinding="Mgj-Wp-HJE" id="uAM-Z4-LBG"> + <dictionary key="options"> + <string key="NSValueTransformerName">HBMixdownTransformer</string> + </dictionary> + </binding> + <binding destination="uS1-Fd-V9I" name="enabled" keyPath="objectValue.mixdownEnabled" id="c7n-yf-re8"/> + <binding destination="uS1-Fd-V9I" name="content" keyPath="objectValue.mixdowns" id="Mgj-Wp-HJE"/> + </connections> + </popUpButton> + </subviews> + <animations/> + </tableCellView> + </prototypeCellViews> </tableColumn> - <tableColumn identifier="samplerate" width="110" minWidth="10" maxWidth="3.4028229999999999e+38" id="NfI-qX-NGY"> + <tableColumn width="111" minWidth="74" maxWidth="3.4028234663852886e+38" id="LxC-Qx-psh"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Samplerate"> <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableHeaderCell> - <popUpButtonCell key="dataCell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="XOK-j0-7l5"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="smallSystem"/> - <menu key="menu" title="OtherViews" id="IMI-0m-Flq"> - <items> - <menuItem title="Pop Up" id="kkp-zN-T9L"/> - </items> - </menu> - </popUpButtonCell> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="dpw-He-8eZ"> + <font key="font" metaFont="system"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <connections> - <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.mixdownEnabled" id="yMS-bS-lfu"/> - <binding destination="I6S-EX-Dvu" name="selectedValue" keyPath="arrangedObjects.sampleRate" previousBinding="ynD-oN-CKW" id="4g4-Uc-Hrq"> - <dictionary key="options"> - <string key="NSValueTransformerName">HBSampleRateTrasformer</string> - </dictionary> - </binding> - <binding destination="I6S-EX-Dvu" name="content" keyPath="arrangedObjects.samplerates" id="ynD-oN-CKW"> - <dictionary key="options"> - <bool key="NSInsertsNullPlaceholder" value="YES"/> - <string key="NSNoSelectionPlaceholder">Auto</string> - <string key="NSNullPlaceholder">Auto</string> - </dictionary> - </binding> - </connections> + <prototypeCellViews> + <tableCellView id="5No-Mm-bpD"> + <rect key="frame" x="431" y="1" width="111" height="24"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <popUpButton verticalHuggingPriority="750" id="r80-yv-59n"> + <rect key="frame" x="0.0" y="0.0" width="111" height="22"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> + <animations/> + <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="pdm-QA-coL"> + <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="smallSystem"/> + <menu key="menu" id="xhO-vr-WJF"/> + </popUpButtonCell> + <connections> + <binding destination="5No-Mm-bpD" name="content" keyPath="objectValue.sampleRates" id="adb-9q-L5r"/> + <binding destination="5No-Mm-bpD" name="enabled" keyPath="objectValue.mixdownEnabled" id="E9O-S2-Uq8"/> + <binding destination="5No-Mm-bpD" name="selectedValue" keyPath="objectValue.sampleRate" previousBinding="adb-9q-L5r" id="DxT-bF-prJ"> + <dictionary key="options"> + <string key="NSNullPlaceholder">Auto</string> + <string key="NSValueTransformerName">HBSampleRateTransformer</string> + </dictionary> + </binding> + </connections> + </popUpButton> + </subviews> + <animations/> + </tableCellView> + </prototypeCellViews> </tableColumn> - <tableColumn identifier="bitrate" width="97" minWidth="10" maxWidth="3.4028229999999999e+38" id="hKf-1o-HNE"> + <tableColumn width="96" minWidth="74" maxWidth="3.4028234663852886e+38" id="vhn-7C-4aZ"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Bitrate"> <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> - </tableHeaderCell> - <popUpButtonCell key="dataCell" type="push" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="EO9-ri-g0o" id="Fzr-Fz-SdB"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="smallSystem"/> - <menu key="menu" title="OtherViews" id="6Qt-Y4-vCG"> - <items> - <menuItem title="Pop Up" state="on" id="EO9-ri-g0o"/> - </items> - </menu> - </popUpButtonCell> - <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <connections> - <binding destination="I6S-EX-Dvu" name="selectedValue" keyPath="arrangedObjects.bitRate" previousBinding="Soq-ZJ-4KR" id="tw7-Kl-He8"> - <dictionary key="options"> - <string key="NSValueTransformerName">HBIntegerTrasformer</string> - </dictionary> - </binding> - <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.bitrateEnabled" id="31K-Op-hHw"/> - <binding destination="I6S-EX-Dvu" name="content" keyPath="arrangedObjects.bitrates" id="Soq-ZJ-4KR"> - <dictionary key="options"> - <string key="NSNoSelectionPlaceholder">None</string> - </dictionary> - </binding> - </connections> - </tableColumn> - <tableColumn identifier="gain" width="34" minWidth="10" maxWidth="3.4028234663852886e+38" id="sef-2z-RiQ"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="Gain"> - <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> - </tableHeaderCell> - <sliderCell key="dataCell" controlSize="small" continuous="YES" state="on" alignment="left" minValue="-5" maxValue="16" doubleValue="0.25" numberOfTickMarks="21" allowsTickMarkValuesOnly="YES" sliderType="circular" id="nEH-R2-7WW"/> - <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <connections> - <binding destination="I6S-EX-Dvu" name="value" keyPath="arrangedObjects.gain" id="8lj-8n-vWu"> - <dictionary key="options"> - <bool key="NSValidatesImmediately" value="YES"/> - </dictionary> - </binding> - <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.passThruDisabled" id="RnT-tA-tlH"/> - </connections> - </tableColumn> - <tableColumn identifier="gainText" width="25" minWidth="10" maxWidth="3.4028234663852886e+38" id="8iJ-ka-Oti"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left"> - <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableHeaderCell> - <textFieldCell key="dataCell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="OHv-wE-adq"> - <font key="font" metaFont="smallSystem"/> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="3o5-Gn-Vao"> + <font key="font" metaFont="system"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> </textFieldCell> <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <connections> - <binding destination="I6S-EX-Dvu" name="value" keyPath="arrangedObjects.gain" id="vWH-Cd-dKZ"> - <dictionary key="options"> - <bool key="NSValidatesImmediately" value="YES"/> - <string key="NSValueTransformerName">HBIntegerTrasformer</string> - </dictionary> - </binding> - <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.passThruDisabled" id="JZi-cA-lcC"/> - </connections> + <prototypeCellViews> + <tableCellView id="Bxd-gI-dFS"> + <rect key="frame" x="545" y="1" width="96" height="24"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <popUpButton verticalHuggingPriority="750" id="hHP-dw-nba"> + <rect key="frame" x="0.0" y="0.0" width="96" height="22"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> + <animations/> + <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="U8n-oy-hkv"> + <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="smallSystem"/> + <menu key="menu" id="pWk-70-S7v"/> + </popUpButtonCell> + <connections> + <binding destination="Bxd-gI-dFS" name="content" keyPath="objectValue.bitRates" id="aT6-o7-lFG"/> + <binding destination="Bxd-gI-dFS" name="enabled" keyPath="objectValue.bitrateEnabled" id="paa-Sa-JU9"/> + <binding destination="Bxd-gI-dFS" name="selectedValue" keyPath="objectValue.bitRate" previousBinding="aT6-o7-lFG" id="CSr-pu-s9O"> + <dictionary key="options"> + <string key="NSValueTransformerName">HBIntegerTransformer</string> + </dictionary> + </binding> + </connections> + </popUpButton> + </subviews> + <animations/> + </tableCellView> + </prototypeCellViews> </tableColumn> - <tableColumn identifier="drc" width="35" minWidth="10" maxWidth="3.4028229999999999e+38" id="wPN-ex-1CZ"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="DRC"> + <tableColumn width="61" minWidth="61" maxWidth="3.4028234663852886e+38" id="N7h-CJ-quV"> + <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Gain"> <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableHeaderCell> - <sliderCell key="dataCell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="4" numberOfTickMarks="16" allowsTickMarkValuesOnly="YES" sliderType="circular" id="say-2a-x5G"/> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="fH9-oV-QdJ"> + <font key="font" metaFont="system"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <connections> - <binding destination="I6S-EX-Dvu" name="value" keyPath="arrangedObjects.drc" id="3lI-ks-4a5"/> - <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.passThruDisabled" id="q8u-5E-Adj"/> - </connections> + <prototypeCellViews> + <tableCellView id="fhc-Nv-0Oh"> + <rect key="frame" x="644" y="1" width="61" height="28"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="xnA-03-Bul"> + <rect key="frame" x="31" y="8" width="29" height="14"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> + <animations/> + <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="0" id="OVr-Jm-VrK"> + <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="xHc-m4-rcn"/> + <font key="font" metaFont="smallSystem"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + <connections> + <binding destination="fhc-Nv-0Oh" name="value" keyPath="objectValue.gain" id="dSi-TT-1tH"/> + <binding destination="fhc-Nv-0Oh" name="enabled" keyPath="objectValue.passThruDisabled" id="NpX-pb-t52"/> + </connections> + </textField> + <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" id="DbI-6O-BzA"> + <rect key="frame" x="3" y="4" width="22" height="22"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <animations/> + <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-5" maxValue="16" doubleValue="0.25" numberOfTickMarks="21" allowsTickMarkValuesOnly="YES" sliderType="circular" id="ea5-qc-etr"/> + <connections> + <binding destination="fhc-Nv-0Oh" name="value" keyPath="objectValue.gain" id="frc-hE-wEW"/> + <binding destination="fhc-Nv-0Oh" name="enabled" keyPath="objectValue.passThruDisabled" id="uQZ-XI-fJG"/> + </connections> + </slider> + </subviews> + <animations/> + </tableCellView> + </prototypeCellViews> </tableColumn> - <tableColumn identifier="drctext" editable="NO" width="25" minWidth="10" maxWidth="3.4028229999999999e+38" id="eLM-kL-FjB"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left"> + <tableColumn width="61" minWidth="61" maxWidth="3.4028234663852886e+38" id="zX9-T9-wKy"> + <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="DRC"> <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableHeaderCell> - <textFieldCell key="dataCell" controlSize="small" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Text" id="a4J-LK-c3P"> - <font key="font" metaFont="smallSystem"/> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="7sl-o7-pUh"> + <font key="font" metaFont="system"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> </textFieldCell> <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <connections> - <binding destination="I6S-EX-Dvu" name="value" keyPath="arrangedObjects.drc" id="TKR-FO-JR4"> - <dictionary key="options"> - <bool key="NSConditionallySetsEditable" value="YES"/> - </dictionary> - </binding> - <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.passThruDisabled" id="IIO-pS-nND"/> - </connections> + <prototypeCellViews> + <tableCellView id="t2K-5D-xsX"> + <rect key="frame" x="708" y="1" width="61" height="27"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" id="DGi-Dl-5nh"> + <rect key="frame" x="3" y="3" width="22" height="22"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <animations/> + <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="4" numberOfTickMarks="16" allowsTickMarkValuesOnly="YES" sliderType="circular" id="MFS-fh-Kd1"/> + <connections> + <binding destination="t2K-5D-xsX" name="value" keyPath="objectValue.drc" id="SVc-TS-Jvf"/> + <binding destination="t2K-5D-xsX" name="enabled" keyPath="objectValue.passThruDisabled" id="VZj-BF-MXl"/> + </connections> + </slider> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="BaY-Lo-8xn"> + <rect key="frame" x="31" y="7" width="29" height="14"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> + <animations/> + <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="0" id="MiI-OV-waZ"> + <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="FR6-Cx-d2s"/> + <font key="font" metaFont="smallSystem"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + <connections> + <binding destination="t2K-5D-xsX" name="value" keyPath="objectValue.drc" id="QDG-V6-YC7"/> + <binding destination="t2K-5D-xsX" name="enabled" keyPath="objectValue.passThruDisabled" id="fkn-Xq-SM0"/> + </connections> + </textField> + </subviews> + <animations/> + </tableCellView> + </prototypeCellViews> </tableColumn> </tableColumns> <connections> - <binding destination="I6S-EX-Dvu" name="content" keyPath="arrangedObjects" id="let-yi-XDX"/> - <binding destination="I6S-EX-Dvu" name="selectionIndexes" keyPath="selectionIndexes" previousBinding="let-yi-XDX" id="zy7-Dz-cEh"/> + <binding destination="I6S-EX-Dvu" name="content" keyPath="arrangedObjects" id="qIU-3F-B41"/> </connections> </tableView> </subviews> @@ -526,99 +648,33 @@ DQ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> </clipView> <animations/> - <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="MQZ-cv-4yN"> - <rect key="frame" x="-100" y="-100" width="685" height="15"/> + <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="ToF-HP-PBf"> + <rect key="frame" x="1" y="51" width="771" height="16"/> <autoresizingMask key="autoresizingMask"/> <animations/> </scroller> - <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="F0o-6a-EMC"> - <rect key="frame" x="-100" y="-100" width="15" height="206"/> + <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="Dhw-4v-YLa"> + <rect key="frame" x="224" y="17" width="15" height="102"/> <autoresizingMask key="autoresizingMask"/> <animations/> </scroller> - <tableHeaderView key="headerView" id="X9E-z1-8Hv"> - <rect key="frame" x="0.0" y="0.0" width="771" height="17"/> + <tableHeaderView key="headerView" id="IbE-bD-EWJ"> + <rect key="frame" x="0.0" y="0.0" width="771" height="23"/> <autoresizingMask key="autoresizingMask"/> <animations/> </tableHeaderView> - <accessibility description="Audio Track Presets"/> - <connections> - <outlet property="nextKeyView" destination="N4q-sT-WgW" id="6gC-Nj-s8x"/> - </connections> </scrollView> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="RtZ-Cz-5mG"> - <rect key="frame" x="18" y="198" width="252" height="14"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <animations/> - <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Audio encoder settings for the selected tracks:" id="007-WM-RmC"> - <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <segmentedControl verticalHuggingPriority="750" id="N4q-sT-WgW"> - <rect key="frame" x="18" y="19" width="54" height="20"/> + <button id="uF5-6E-EIe"> + <rect key="frame" x="80" y="42" width="281" height="18"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <string key="toolTip">Only the primary audio track will be encoded with the full encoder list. All other secondary audio output tracks will be encoded with first encoder only.</string> <animations/> - <segmentedCell key="cell" controlSize="small" borderStyle="border" alignment="left" style="rounded" trackingMode="momentary" id="otA-K4-TxM"> - <font key="font" metaFont="smallSystem"/> - <segments> - <segment toolTip="Add Preset Track" image="NSAddTemplate" width="24"> - <nil key="label"/> - </segment> - <segment toolTip="Remove Selected Preset Track" image="NSRemoveTemplate" width="23" tag="1"> - <nil key="label"/> - </segment> - </segments> - </segmentedCell> - <connections> - <action selector="addTrack:" target="-2" id="vsd-5z-3e3"/> - <outlet property="nextKeyView" destination="sC2-52-liU" id="mmR-bd-cFG"/> - </connections> - </segmentedControl> - <button id="os0-Jl-OXF"> - <rect key="frame" x="650" y="404" width="77" height="18"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <string key="toolTip">Enable this if your playback device supports TrueHD. This permits TrueHD passthru to be selected when automatic passthru selecion is enabled.</string> - <animations/> - <buttonCell key="cell" type="check" title="TrueHD" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="z9d-P3-6UP"> - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> - <font key="font" metaFont="smallSystem"/> - </buttonCell> - <connections> - <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="tU2-ar-p5a"/> - <binding destination="-2" name="value" keyPath="self.settings.allowTrueHDPassthru" id="3fh-cT-PtB"/> - <outlet property="nextKeyView" destination="0HY-xB-cvO" id="TYi-8L-gT4"/> - </connections> - </button> - <button id="0HY-xB-cvO"> - <rect key="frame" x="650" y="386" width="77" height="18"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <string key="toolTip">Enable this if your playback device supports FLAC. This permits FLAC passthru to be selected when automatic passthru selecion is enabled.</string> - <animations/> - <buttonCell key="cell" type="check" title="FLAC" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="naS-No-CdV"> - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> - <font key="font" metaFont="smallSystem"/> - </buttonCell> - <connections> - <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="SFz-OO-EgN"/> - <binding destination="-2" name="value" keyPath="self.settings.allowFLACPassthru" id="wCD-CW-AEP"/> - <outlet property="nextKeyView" destination="BK7-c4-kkk" id="Pt4-9c-oQl"/> - </connections> - </button> - <button id="BK7-c4-kkk"> - <rect key="frame" x="650" y="368" width="77" height="18"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <string key="toolTip">Enable this if your playback device supports EAC3. This permits EAC3 passthru to be selected when automatic passthru selecion is enabled.</string> - <animations/> - <buttonCell key="cell" type="check" title="EAC3" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="u9h-dn-wcK"> + <buttonCell key="cell" type="check" title="Use only first encoder for secondary audio" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="66v-2g-DHn"> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <font key="font" metaFont="smallSystem"/> </buttonCell> <connections> - <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="83N-qg-BsJ"/> - <binding destination="-2" name="value" keyPath="self.settings.allowEAC3Passthru" id="vcL-wd-H1f"/> - <outlet property="nextKeyView" destination="LdN-Cx-ZJY" id="scB-D1-Zvp"/> + <binding destination="-2" name="value" keyPath="self.settings.secondaryEncoderMode" id="Umc-CV-pJy"/> </connections> </button> </subviews> @@ -627,7 +683,7 @@ DQ <connections> <outlet property="initialFirstResponder" destination="oiD-QI-wly" id="Vxi-xi-P0d"/> </connections> - <point key="canvasLocation" x="-484.5" y="517"/> + <point key="canvasLocation" x="-205.5" y="81"/> </window> <arrayController objectClassName="HBLang" id="ZBe-aP-wvq" userLabel="Languages Table Controller" customClass="HBLanguageArrayController"> <declaredKeys> diff --git a/macosx/HBAudioDefaults.h b/macosx/HBAudioDefaults.h index 85b60fb66..fce8185ef 100644 --- a/macosx/HBAudioDefaults.h +++ b/macosx/HBAudioDefaults.h @@ -44,7 +44,7 @@ typedef NS_ENUM(NSUInteger, HBAudioTrackSelectionBehavior) { @property(nonatomic, readwrite) int encoderFallback; @property(nonatomic, readwrite) BOOL secondaryEncoderMode; -@property(nonatomic, readonly) NSArray *audioEncoderFallbacks; +@property(nonatomic, readonly) NSArray<NSString *> *audioEncoderFallbacks; - (void)validateEncoderFallbackForVideoContainer:(int)container; diff --git a/macosx/HBAudioDefaults.m b/macosx/HBAudioDefaults.m index dc43a0372..5035f8c0d 100644 --- a/macosx/HBAudioDefaults.m +++ b/macosx/HBAudioDefaults.m @@ -148,9 +148,9 @@ _secondaryEncoderMode = secondaryEncoderMode; } -- (NSArray *)audioEncoderFallbacks +- (NSArray<NSString *> *)audioEncoderFallbacks { - NSMutableArray *fallbacks = [[NSMutableArray alloc] init]; + NSMutableArray<NSString *> *fallbacks = [[NSMutableArray alloc] init]; for (const hb_encoder_t *audio_encoder = hb_audio_encoder_get_next(NULL); audio_encoder != NULL; audio_encoder = hb_audio_encoder_get_next(audio_encoder)) @@ -452,6 +452,7 @@ copy->_allowFLACPassthru = _allowFLACPassthru; copy->_encoderFallback = _encoderFallback; + copy->_container = _container; copy->_secondaryEncoderMode = _secondaryEncoderMode; } @@ -467,7 +468,7 @@ - (void)encodeWithCoder:(NSCoder *)coder { - [coder encodeInt:1 forKey:@"HBAudioDefaultsVersion"]; + [coder encodeInt:2 forKey:@"HBAudioDefaultsVersion"]; encodeInteger(_trackSelectionBehavior); encodeObject(_trackSelectionLanguages); @@ -484,6 +485,7 @@ encodeBool(_allowFLACPassthru); encodeInt(_encoderFallback); + encodeInt(_container); encodeBool(_secondaryEncoderMode); } @@ -506,6 +508,7 @@ decodeBool(_allowFLACPassthru); decodeInt(_encoderFallback); + decodeInt(_container); decodeBool(_secondaryEncoderMode); return self; diff --git a/macosx/HBAudioDefaultsController.m b/macosx/HBAudioDefaultsController.m index b7c975016..cc90879de 100644 --- a/macosx/HBAudioDefaultsController.m +++ b/macosx/HBAudioDefaultsController.m @@ -8,7 +8,7 @@ #import "HBAudioDefaults.h" #import "HBLanguagesSelection.h" -static void *HBAudioDefaultsContex = &HBAudioDefaultsContex; +static void *HBAudioDefaultsContext = &HBAudioDefaultsContext; @interface HBAudioDefaultsController () @@ -40,7 +40,7 @@ static void *HBAudioDefaultsContex = &HBAudioDefaultsContex; - (void)windowDidLoad { - [self addObserver:self forKeyPath:@"tableController.showSelectedOnly" options:0 context:HBAudioDefaultsContex]; + [self addObserver:self forKeyPath:@"tableController.showSelectedOnly" options:0 context:HBAudioDefaultsContext]; if (self.settings.trackSelectionLanguages.count) { @@ -50,7 +50,7 @@ static void *HBAudioDefaultsContex = &HBAudioDefaultsContex; - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context { - if (context == HBAudioDefaultsContex) + if (context == HBAudioDefaultsContext) { if ([keyPath isEqualToString:@"tableController.showSelectedOnly"]) { @@ -96,7 +96,7 @@ static void *HBAudioDefaultsContex = &HBAudioDefaultsContex; - (void)dealloc { @try { - [self removeObserver:self forKeyPath:@"tableController.showSelectedOnly"]; + [self removeObserver:self forKeyPath:@"tableController.showSelectedOnly" context:HBAudioDefaultsContext]; } @catch (NSException * __unused exception) {} } diff --git a/macosx/HBAudioTrackPreset.h b/macosx/HBAudioTrackPreset.h index 0c96a3af8..1acd14a20 100644 --- a/macosx/HBAudioTrackPreset.h +++ b/macosx/HBAudioTrackPreset.h @@ -32,10 +32,10 @@ NS_ASSUME_NONNULL_BEGIN /** * Arrays of possible options for the track properties. */ -@property (nonatomic, readonly) NSArray *encoders; -@property (nonatomic, readonly) NSArray *mixdowns; -@property (nonatomic, readonly) NSArray *samplerates; -@property (nonatomic, readonly) NSArray *bitrates; +@property (nonatomic, readonly) NSArray<NSString *> *encoders; +@property (nonatomic, readonly) NSArray<NSString *> *mixdowns; +@property (nonatomic, readonly) NSArray<NSString *> *sampleRates; +@property (nonatomic, readonly) NSArray<NSString *> *bitRates; @property (nonatomic, readwrite, weak, nullable) NSUndoManager *undo; @@ -47,14 +47,14 @@ NS_ASSUME_NONNULL_END * A series of value trasformers to bridge the libhb enums * to the textual rapresentations used in the interface. */ -@interface HBEncoderTrasformer : NSValueTransformer +@interface HBEncoderTransformer : NSValueTransformer @end -@interface HBMixdownTrasformer : NSValueTransformer +@interface HBMixdownTransformer : NSValueTransformer @end -@interface HBSampleRateTrasformer : NSValueTransformer +@interface HBSampleRateTransformer : NSValueTransformer @end -@interface HBIntegerTrasformer : NSValueTransformer +@interface HBIntegerTransformer : NSValueTransformer @end
\ No newline at end of file diff --git a/macosx/HBAudioTrackPreset.m b/macosx/HBAudioTrackPreset.m index 56c6f65e0..1cd900969 100644 --- a/macosx/HBAudioTrackPreset.m +++ b/macosx/HBAudioTrackPreset.m @@ -227,9 +227,9 @@ static void *HBAudioEncoderContex = &HBAudioEncoderContex; #pragma mark - Options -- (NSArray *)encoders +- (NSArray<NSString *> *)encoders { - NSMutableArray *encoders = [[NSMutableArray alloc] init]; + NSMutableArray<NSString *> *encoders = [[NSMutableArray alloc] init]; for (const hb_encoder_t *audio_encoder = hb_audio_encoder_get_next(NULL); audio_encoder != NULL; audio_encoder = hb_audio_encoder_get_next(audio_encoder)) @@ -239,9 +239,9 @@ static void *HBAudioEncoderContex = &HBAudioEncoderContex; return encoders; } -- (NSArray *)mixdowns +- (NSArray<NSString *> *)mixdowns { - NSMutableArray *mixdowns = [[NSMutableArray alloc] init]; + NSMutableArray<NSString *> *mixdowns = [[NSMutableArray alloc] init]; for (const hb_mixdown_t *mixdown = hb_mixdown_get_next(NULL); mixdown != NULL; mixdown = hb_mixdown_get_next(mixdown)) @@ -254,9 +254,9 @@ static void *HBAudioEncoderContex = &HBAudioEncoderContex; return mixdowns; } -- (NSArray *)samplerates +- (NSArray<NSString *> *)sampleRates { - NSMutableArray *samplerates = [[NSMutableArray alloc] init]; + NSMutableArray<NSString *> *sampleRates = [[NSMutableArray alloc] init]; for (const hb_rate_t *audio_samplerate = hb_audio_samplerate_get_next(NULL); audio_samplerate != NULL; audio_samplerate = hb_audio_samplerate_get_next(audio_samplerate)) @@ -264,30 +264,30 @@ static void *HBAudioEncoderContex = &HBAudioEncoderContex; int rate = audio_samplerate->rate; if (rate == hb_audio_samplerate_get_best(self.encoder, rate, NULL)) { - [samplerates addObject:@(audio_samplerate->name)]; + [sampleRates addObject:@(audio_samplerate->name)]; } } - return samplerates; + return sampleRates; } -- (NSArray *)bitrates +- (NSArray<NSString *> *)bitRates { int minBitRate = 0; int maxBitRate = 0; hb_audio_bitrate_get_limits(self.encoder, self.sampleRate, self.mixdown, &minBitRate, &maxBitRate); - NSMutableArray *bitrates = [[NSMutableArray alloc] init]; + NSMutableArray<NSString *> *bitRates = [[NSMutableArray alloc] init]; for (const hb_rate_t *audio_bitrate = hb_audio_bitrate_get_next(NULL); audio_bitrate != NULL; audio_bitrate = hb_audio_bitrate_get_next(audio_bitrate)) { if (audio_bitrate->rate >= minBitRate && audio_bitrate->rate <= maxBitRate) { - [bitrates addObject:@(audio_bitrate->name)]; + [bitRates addObject:@(audio_bitrate->name)]; } } - return bitrates; + return bitRates; } + (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key @@ -306,6 +306,14 @@ static void *HBAudioEncoderContex = &HBAudioEncoderContex; return retval; } +- (void)setNilValueForKey:(NSString *)key +{ + if ([key isEqualToString:@"drc"] || [key isEqualToString:@"gain"]) + { + [self setValue:@0 forKey:key]; + } +} + #pragma mark - NSCopying - (instancetype)copyWithZone:(NSZone *)zone @@ -371,7 +379,7 @@ static void *HBAudioEncoderContex = &HBAudioEncoderContex; #pragma mark - Value Trasformers -@implementation HBEncoderTrasformer +@implementation HBEncoderTransformer + (Class)transformedValueClass { @@ -403,7 +411,7 @@ static void *HBAudioEncoderContex = &HBAudioEncoderContex; @end -@implementation HBMixdownTrasformer +@implementation HBMixdownTransformer + (Class)transformedValueClass { @@ -435,7 +443,7 @@ static void *HBAudioEncoderContex = &HBAudioEncoderContex; @end -@implementation HBSampleRateTrasformer +@implementation HBSampleRateTransformer + (Class)transformedValueClass { @@ -472,7 +480,7 @@ static void *HBAudioEncoderContex = &HBAudioEncoderContex; @end -@implementation HBIntegerTrasformer +@implementation HBIntegerTransformer + (Class)transformedValueClass { |