diff options
| -rw-r--r-- | macosx/English.lproj/Audio.xib | 579 | ||||
| -rw-r--r-- | macosx/HBAudioTrack.m | 16 |
2 files changed, 347 insertions, 248 deletions
diff --git a/macosx/English.lproj/Audio.xib b/macosx/English.lproj/Audio.xib index feae40baf..06bef939f 100644 --- a/macosx/English.lproj/Audio.xib +++ b/macosx/English.lproj/Audio.xib @@ -13,15 +13,7 @@ </customObject> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> <customObject id="-3" userLabel="Application" customClass="NSObject"/> - <arrayController id="iWY-gv-3ab" userLabel="Audio Inputs"> - <declaredKeys> - <string>keyAudioTrackName</string> - </declaredKeys> - <connections> - <binding destination="-2" name="contentArray" keyPath="self.audio.masterTrackArray" id="nbW-pN-u9p"/> - </connections> - </arrayController> - <arrayController preservesSelection="NO" avoidsEmptySelection="NO" id="rzb-Si-Kpf" userLabel="Audios"> + <arrayController preservesSelection="NO" avoidsEmptySelection="NO" id="rzb-Si-Kpf"> <declaredKeys> <string>tracks</string> <string>tracks.keyAudioTrackName</string> @@ -55,228 +47,390 @@ <rect key="frame" x="0.0" y="0.0" width="926" height="322"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <scrollView autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="uE3-SE-Oss"> - <rect key="frame" x="20" y="20" width="886" height="266"/> + <button identifier="Codec" verticalHuggingPriority="750" id="vFP-nq-IQg"> + <rect key="frame" x="110" y="288" width="140" height="28"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <animations/> + <buttonCell key="cell" type="push" title="Configure Defaults…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="aYF-d5-Ya6"> + <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="smallSystem"/> + </buttonCell> + <connections> + <action selector="showSettingsSheet:" target="-2" id="D9K-M3-zHd"/> + <binding destination="-2" name="enabled" keyPath="self.audio" id="cWq-t8-vFR"> + <dictionary key="options"> + <string key="NSValueTransformerName">NSIsNotNil</string> + </dictionary> + </binding> + </connections> + </button> + <button verticalHuggingPriority="750" id="wcL-rL-aYS"> + <rect key="frame" x="248" y="288" width="116" height="28"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <animations/> + <buttonCell key="cell" type="push" title="Reload Defaults" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="q2P-Tg-cBJ"> + <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="smallSystem"/> + </buttonCell> + <connections> + <action selector="reloadDefaults:" target="-2" id="k9I-I9-T2U"/> + <binding destination="-2" name="enabled" keyPath="self.audio" id="sJS-am-vnf"> + <dictionary key="options"> + <string key="NSValueTransformerName">NSIsNotNil</string> + </dictionary> + </binding> + </connections> + </button> + <popUpButton verticalHuggingPriority="750" id="jrP-M5-2Rq"> + <rect key="frame" x="17" y="291" width="88" height="22"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <animations/> + <popUpButtonCell key="cell" type="push" title="Track" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="AoT-G9-aA4"> + <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="smallSystem"/> + <menu key="menu" title="OtherViews" id="Vxo-66-Mrx"> + <items> + <menuItem title="Track" state="on" hidden="YES" id="Pfh-Bc-83k"/> + <menuItem title="Add All" id="AMA-Ul-v2f"> + <connections> + <action selector="addAllAudioTracks:" target="-2" id="8LO-bD-Fjy"/> + </connections> + </menuItem> + <menuItem isSeparatorItem="YES" id="CCk-3A-ULa"/> + <menuItem title="Remove All" id="YlA-ue-5oE"> + <connections> + <action selector="removeAll:" target="-2" id="Hbr-n5-nOt"/> + </connections> + </menuItem> + </items> + </menu> + </popUpButtonCell> + <connections> + <binding destination="-2" name="enabled" keyPath="self.audio" id="vyM-YV-Yqi"> + <dictionary key="options"> + <string key="NSValueTransformerName">NSIsNotNil</string> + </dictionary> + </binding> + </connections> + </popUpButton> + <scrollView autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="Yzu-Rk-hTv"> + <rect key="frame" x="20" y="20" width="886" height="264"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <clipView key="contentView" id="RfG-9v-Rts"> - <rect key="frame" x="1" y="17" width="884" height="248"/> + <clipView key="contentView" id="2VK-QX-oZ0"> + <rect key="frame" x="1" y="23" width="884" height="240"/> <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="GLD-lI-qeh" id="LlC-ua-mth"> - <rect key="frame" x="0.0" y="0.0" width="884" height="248"/> + <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="25" rowSizeStyle="automatic" headerView="jdT-w6-s4n" viewBased="YES" id="yix-PF-sqH"> + <rect key="frame" x="0.0" y="0.0" width="884" height="240"/> <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="track" editable="NO" width="322" minWidth="40" maxWidth="1000" id="gRu-la-4i7"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Track"> + <tableColumn width="322" minWidth="40" maxWidth="1000" id="7sz-4X-5jA"> + <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Track"> <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/> + <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="Oa8-0K-PPX" id="xWU-Pf-IHv"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="smallSystem"/> - <menu key="menu" title="OtherViews" id="Uir-S5-yLw"> - <items> - <menuItem title="Pop Up" state="on" id="Oa8-0K-PPX"/> - </items> - </menu> - </popUpButtonCell> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="l8E-uG-8fo"> + <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="iWY-gv-3ab" name="content" keyPath="arrangedObjects" id="Ie2-Do-VdN"/> - <binding destination="iWY-gv-3ab" name="contentValues" keyPath="arrangedObjects.keyAudioTrackName" previousBinding="Ie2-Do-VdN" id="oTn-J8-yoY"/> - <binding destination="rzb-Si-Kpf" name="selectedObject" keyPath="arrangedObjects.track" previousBinding="oTn-J8-yoY" id="fh6-LS-cAe"/> - </connections> + <prototypeCellViews> + <tableCellView id="wJH-tU-zL6"> + <rect key="frame" x="1" y="1" width="322" height="25"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <popUpButton verticalHuggingPriority="750" id="6iN-2G-JDF"> + <rect key="frame" x="0.0" y="1" width="322" 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="ExA-Sd-3dO"> + <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="smallSystem"/> + <menu key="menu" id="hXU-xc-dxL"/> + </popUpButtonCell> + <connections> + <binding destination="wJH-tU-zL6" name="content" keyPath="objectValue.masterTrackArray" id="pvQ-pN-TdG"/> + <binding destination="wJH-tU-zL6" name="contentValues" keyPath="objectValue.masterTrackArray.keyAudioTrackName" previousBinding="pvQ-pN-TdG" id="Wec-Fo-DSj"/> + <binding destination="wJH-tU-zL6" name="selectedObject" keyPath="objectValue.track" previousBinding="Wec-Fo-DSj" id="Qoy-ym-QWQ"/> + </connections> + </popUpButton> + </subviews> + <animations/> + </tableCellView> + </prototypeCellViews> </tableColumn> - <tableColumn identifier="codec" width="140" minWidth="140" maxWidth="3.4028229999999999e+38" id="dI5-Bu-m9C"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Codec"> + <tableColumn width="143" minWidth="143" maxWidth="1000" id="lnO-sZ-6xv"> + <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" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="YpG-KX-KsI" id="S5G-sn-g3u"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="smallSystem"/> - <menu key="menu" title="OtherViews" id="7Cr-sT-Iwx"> - <items> - <menuItem title="Pop Up" state="on" id="YpG-KX-KsI"/> - </items> - </menu> - </popUpButtonCell> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="6Iz-D8-zzz"> + <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="rzb-Si-Kpf" name="selectedObject" keyPath="arrangedObjects.codec" previousBinding="XJw-aT-etB" id="S7r-tN-wM2"/> - <binding destination="rzb-Si-Kpf" name="content" keyPath="arrangedObjects.codecs" id="Rhu-Z1-dOp"/> - <binding destination="rzb-Si-Kpf" name="contentValues" keyPath="arrangedObjects.codecs.keyAudioCodecName" previousBinding="Rhu-Z1-dOp" id="XJw-aT-etB"/> - <binding destination="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.enabled" id="3q0-x0-5zx"/> - </connections> + <prototypeCellViews> + <tableCellView id="8ed-5g-y6e"> + <rect key="frame" x="326" y="1" width="143" height="25"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <popUpButton verticalHuggingPriority="750" id="tYY-w7-ZIq"> + <rect key="frame" x="0.0" y="1" width="143" 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="eIX-Zp-DHh"> + <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="smallSystem"/> + <menu key="menu" id="aad-Xw-epF"/> + <connections> + <binding destination="8ed-5g-y6e" name="enabled" keyPath="objectValue.enabled" id="MOh-YJ-qpZ"/> + </connections> + </popUpButtonCell> + <connections> + <binding destination="8ed-5g-y6e" name="selectedObject" keyPath="objectValue.codec" previousBinding="cvm-Mj-Drh" id="sEl-p7-19g"/> + <binding destination="8ed-5g-y6e" name="content" keyPath="objectValue.codecs" id="pxN-GH-Dfr"/> + <binding destination="8ed-5g-y6e" name="contentValues" keyPath="objectValue.codecs.keyAudioCodecName" previousBinding="pxN-GH-Dfr" id="cvm-Mj-Drh"/> + <binding destination="8ed-5g-y6e" name="enabled" keyPath="objectValue.enabled" id="V0U-a3-ZBW"/> + </connections> + </popUpButton> + </subviews> + <animations/> + </tableCellView> + </prototypeCellViews> </tableColumn> - <tableColumn identifier="mixdown" width="128" minWidth="128" maxWidth="3.4028229999999999e+38" id="3wx-Uv-5Uc"> + <tableColumn identifier="" width="128" minWidth="128" maxWidth="3.4028234663852886e+38" id="qS7-Xr-9N8"> <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="6KP-up-v0L" id="iPl-mc-59p"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="smallSystem"/> - <menu key="menu" title="OtherViews" id="ThG-6I-ogh"> - <items> - <menuItem title="Pop Up" state="on" id="6KP-up-v0L"/> - </items> - </menu> - </popUpButtonCell> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="kmi-ru-dRe"> + <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="rzb-Si-Kpf" name="selectedObject" keyPath="arrangedObjects.mixdown" previousBinding="eLm-QG-NGR" id="LOT-t7-LWV"> - <dictionary key="options"> - <bool key="NSCreatesSortDescriptor" value="NO"/> - </dictionary> - </binding> - <binding destination="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.mixdownEnabled" id="IBK-Ut-O6Y"/> - <binding destination="rzb-Si-Kpf" name="content" keyPath="arrangedObjects.mixdowns" id="Cfe-Wx-NFu"/> - <binding destination="rzb-Si-Kpf" name="contentValues" keyPath="arrangedObjects.mixdowns.keyAudioMixdownName" previousBinding="Cfe-Wx-NFu" id="eLm-QG-NGR"/> - </connections> + <prototypeCellViews> + <tableCellView id="JWs-Gl-4kd"> + <rect key="frame" x="472" y="1" width="128" height="25"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <popUpButton verticalHuggingPriority="750" id="LLW-KN-65P"> + <rect key="frame" x="0.0" y="1" width="128" 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="CAe-A2-A0F"> + <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="smallSystem"/> + <menu key="menu" id="5Ha-Of-SJF"/> + </popUpButtonCell> + <connections> + <binding destination="JWs-Gl-4kd" name="selectedObject" keyPath="objectValue.mixdown" previousBinding="mrr-Rw-0Km" id="fAC-AG-TmT"/> + <binding destination="JWs-Gl-4kd" name="enabled" keyPath="objectValue.mixdownEnabled" id="anJ-dk-glQ"/> + <binding destination="JWs-Gl-4kd" name="content" keyPath="objectValue.mixdowns" id="N2w-i8-sMD"/> + <binding destination="JWs-Gl-4kd" name="contentValues" keyPath="objectValue.mixdowns.keyAudioMixdownName" previousBinding="N2w-i8-sMD" id="mrr-Rw-0Km"/> + </connections> + </popUpButton> + </subviews> + <animations/> + </tableCellView> + </prototypeCellViews> </tableColumn> - <tableColumn identifier="samplerate" width="72" minWidth="72" maxWidth="3.4028229999999999e+38" id="4ge-RO-Qjs"> + <tableColumn identifier="" width="74" minWidth="74" maxWidth="3.4028234663852886e+38" id="jub-Uq-qYL"> <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" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="HX0-fQ-k4C" id="LWh-ZT-m8J"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="smallSystem"/> - <menu key="menu" title="OtherViews" id="bfn-7j-zra"> - <items> - <menuItem title="Pop Up" state="on" id="HX0-fQ-k4C"/> - </items> - </menu> - </popUpButtonCell> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="MZ7-W1-uGl"> + <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="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.mixdownEnabled" id="1Ce-Kl-47e"/> - <binding destination="rzb-Si-Kpf" name="selectedObject" keyPath="arrangedObjects.sampleRate" previousBinding="ErN-GC-Ge9" id="4uH-KH-1V7"> - <dictionary key="options"> - <bool key="NSCreatesSortDescriptor" value="NO"/> - </dictionary> - </binding> - <binding destination="rzb-Si-Kpf" name="content" keyPath="arrangedObjects.sampleRates" id="92M-oG-NTY"/> - <binding destination="rzb-Si-Kpf" name="contentValues" keyPath="arrangedObjects.sampleRates.keyAudioSampleRateName" previousBinding="92M-oG-NTY" id="ErN-GC-Ge9"/> - </connections> + <prototypeCellViews> + <tableCellView id="iQl-Lr-pqe"> + <rect key="frame" x="603" y="1" width="74" height="25"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <popUpButton verticalHuggingPriority="750" id="QA9-1y-Pyj"> + <rect key="frame" x="0.0" y="1" width="74" 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="ewo-F6-Dcj"> + <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="smallSystem"/> + <menu key="menu" id="phf-E4-JNn"/> + </popUpButtonCell> + <connections> + <binding destination="iQl-Lr-pqe" name="enabled" keyPath="objectValue.mixdownEnabled" id="7np-q0-yTV"/> + <binding destination="iQl-Lr-pqe" name="selectedObject" keyPath="objectValue.sampleRate" previousBinding="lhu-ag-YDS" id="2BU-o2-PJ0"/> + <binding destination="iQl-Lr-pqe" name="content" keyPath="objectValue.sampleRates" id="Q5x-J9-u3J"/> + <binding destination="iQl-Lr-pqe" name="contentValues" keyPath="objectValue.sampleRates.keyAudioSampleRateName" previousBinding="Q5x-J9-u3J" id="lhu-ag-YDS"/> + </connections> + </popUpButton> + </subviews> + <animations/> + </tableCellView> + </prototypeCellViews> </tableColumn> - <tableColumn identifier="bitrate" width="72" minWidth="72" maxWidth="3.4028229999999999e+38" id="icy-WJ-qjH"> + <tableColumn identifier="" width="74" minWidth="74" maxWidth="3.4028234663852886e+38" id="obP-lK-sY0"> <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" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="YmG-Il-WGI"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="smallSystem"/> - <menu key="menu" title="OtherViews" id="cPd-Hx-eHs"> - <items> - <menuItem title="Pop Up" id="ScK-9X-Gvn"/> - </items> - </menu> - </popUpButtonCell> - <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <connections> - <binding destination="rzb-Si-Kpf" name="selectedObject" keyPath="arrangedObjects.bitRate" previousBinding="aJi-it-rd3" id="JLj-Mg-gQL"> - <dictionary key="options"> - <bool key="NSCreatesSortDescriptor" value="NO"/> - </dictionary> - </binding> - <binding destination="rzb-Si-Kpf" name="content" keyPath="arrangedObjects.bitRates" id="wpG-YB-fxH"/> - <binding destination="rzb-Si-Kpf" name="contentValues" keyPath="arrangedObjects.bitRates.keyAudioBitrateName" previousBinding="wpG-YB-fxH" id="aJi-it-rd3"/> - <binding destination="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.bitrateEnabled" id="eNf-Cc-xL3"/> - </connections> - </tableColumn> - <tableColumn identifier="gain" width="36" minWidth="36" maxWidth="3.4028234663852886e+38" id="psI-ue-Jsr"> - <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="3XQ-vq-IRV"/> - <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <connections> - <binding destination="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.PassThruDisabled" id="AY4-98-DiI"/> - <binding destination="rzb-Si-Kpf" name="value" keyPath="arrangedObjects.gain" id="T1e-LK-znD"> - <dictionary key="options"> - <bool key="NSCreatesSortDescriptor" value="NO"/> - <bool key="NSValidatesImmediately" value="YES"/> - </dictionary> - </binding> - </connections> - </tableColumn> - <tableColumn identifier="gainText" width="25" minWidth="25" maxWidth="3.4028234663852886e+38" id="fy5-z6-TRg"> - <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="Vbk-Fc-rCj"> - <font key="font" metaFont="smallSystem"/> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="eFn-1M-3hk"> + <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="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.PassThruDisabled" id="L5Z-ZJ-Zjq"/> - <binding destination="rzb-Si-Kpf" name="value" keyPath="arrangedObjects.gain" id="AwB-52-7Cm"> - <dictionary key="options"> - <bool key="NSValidatesImmediately" value="YES"/> - </dictionary> - </binding> - </connections> + <prototypeCellViews> + <tableCellView id="Acc-Cw-PLD"> + <rect key="frame" x="680" y="1" width="74" height="25"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <popUpButton verticalHuggingPriority="750" id="Qg1-iw-07b"> + <rect key="frame" x="0.0" y="1" width="74" 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="HcR-KC-NJF"> + <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="smallSystem"/> + <menu key="menu" id="DFY-hE-Hi6"/> + </popUpButtonCell> + <connections> + <binding destination="Acc-Cw-PLD" name="selectedObject" keyPath="objectValue.bitRate" previousBinding="cgA-Y3-ucA" id="9OJ-Wp-j0I"/> + <binding destination="Acc-Cw-PLD" name="content" keyPath="objectValue.bitRates" id="S0T-S3-WF5"/> + <binding destination="Acc-Cw-PLD" name="contentValues" keyPath="objectValue.bitRates.keyAudioBitrateName" previousBinding="S0T-S3-WF5" id="cgA-Y3-ucA"/> + <binding destination="Acc-Cw-PLD" name="enabled" keyPath="objectValue.bitrateEnabled" id="woZ-ZV-ZQJ"/> + </connections> + </popUpButton> + </subviews> + <animations/> + </tableCellView> + </prototypeCellViews> </tableColumn> - <tableColumn identifier="drc" width="35" minWidth="35" maxWidth="3.4028229999999999e+38" id="whw-Me-VIU"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="DRC"> + <tableColumn identifier="" width="61" minWidth="61" maxWidth="3.4028234663852886e+38" id="5xO-DR-4cR"> + <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="jVw-iZ-yhL"/> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="HKE-hO-jOm"> + <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="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.DRCEnabled" id="uRE-B4-yzg"/> - <binding destination="rzb-Si-Kpf" name="value" keyPath="arrangedObjects.drc" id="nOq-9s-eHF"/> - </connections> + <prototypeCellViews> + <tableCellView id="wfV-Pi-jHd"> + <rect key="frame" x="757" y="1" width="61" height="25"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="2c7-G5-4KL"> + <rect key="frame" x="31" y="5" 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="Q4T-80-wxf"> + <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="uNn-5A-2RM"/> + <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="wfV-Pi-jHd" name="enabled" keyPath="objectValue.PassThruDisabled" id="NnK-Vf-hM6"/> + <binding destination="wfV-Pi-jHd" name="value" keyPath="objectValue.gain" id="7hD-ql-cNT"> + <dictionary key="options"> + <bool key="NSValidatesImmediately" value="YES"/> + </dictionary> + </binding> + </connections> + </textField> + <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" id="gtC-MM-esd"> + <rect key="frame" x="3" y="0.0" 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="BBQ-FP-aQN"/> + <connections> + <binding destination="wfV-Pi-jHd" name="enabled" keyPath="objectValue.PassThruDisabled" id="Wz3-ZW-SLi"/> + <binding destination="wfV-Pi-jHd" name="value" keyPath="objectValue.gain" id="bKN-kD-NjJ"> + <dictionary key="options"> + <bool key="NSValidatesImmediately" value="YES"/> + </dictionary> + </binding> + </connections> + </slider> + </subviews> + <animations/> + </tableCellView> + </prototypeCellViews> </tableColumn> - <tableColumn identifier="drctext" editable="NO" width="27" minWidth="27" maxWidth="3.4028229999999999e+38" id="ASp-Mc-vG6"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left"> + <tableColumn identifier="" width="61" minWidth="61" maxWidth="3.4028234663852886e+38" id="eAS-E5-fip"> + <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="Qw5-9v-GFf"> - <font key="font" metaFont="smallSystem"/> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="aaP-HB-s4f"> + <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="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.DRCEnabled" id="7a1-p0-bgX"/> - <binding destination="rzb-Si-Kpf" name="value" keyPath="arrangedObjects.drc" id="YWG-sr-noG"> - <dictionary key="options"> - <bool key="NSConditionallySetsEditable" value="YES"/> - </dictionary> - </binding> - </connections> + <prototypeCellViews> + <tableCellView id="RMf-U7-5Td"> + <rect key="frame" x="821" y="1" width="61" height="25"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" id="o3M-fP-6Ps"> + <rect key="frame" x="3" y="1" width="22" height="22"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <animations/> + <sliderCell key="cell" controlSize="small" alignment="left" maxValue="4" numberOfTickMarks="16" allowsTickMarkValuesOnly="YES" sliderType="circular" id="nII-CW-aWc"/> + <connections> + <binding destination="RMf-U7-5Td" name="enabled" keyPath="objectValue.DRCEnabled" id="tzk-tB-jEf"/> + <binding destination="RMf-U7-5Td" name="value" keyPath="objectValue.drc" id="Ays-qW-4CS"/> + </connections> + </slider> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="yPh-4R-HRQ"> + <rect key="frame" x="31" y="5" 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="Ifq-hI-oCs"> + <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="Tnc-So-JNG"/> + <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="RMf-U7-5Td" name="enabled" keyPath="objectValue.DRCEnabled" id="FS6-ca-Kmi"/> + <binding destination="RMf-U7-5Td" name="value" keyPath="objectValue.drc" id="kxy-BT-vv2"/> + </connections> + </textField> + </subviews> + <animations/> + </tableCellView> + </prototypeCellViews> </tableColumn> </tableColumns> <connections> - <binding destination="-2" name="enabled" keyPath="self.audio" id="V0I-xd-Lo6"> + <binding destination="rzb-Si-Kpf" name="content" keyPath="arrangedObjects" id="vu0-Hb-NuW"/> + <binding destination="-2" name="enabled" keyPath="self.audio" id="1Zi-dE-qoZ"> <dictionary key="options"> <string key="NSValueTransformerName">NSIsNotNil</string> </dictionary> </binding> - <outlet property="menu" destination="hyy-qd-qpe" id="e5W-aS-mPB"/> + <outlet property="menu" destination="hyy-qd-qpe" id="4K4-53-mMF"/> </connections> </tableView> </subviews> @@ -284,93 +438,26 @@ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> </clipView> <animations/> - <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="1Fp-Pd-fdH"> - <rect key="frame" x="-100" y="-100" width="685" height="15"/> + <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="Pf5-Yq-6oL"> + <rect key="frame" x="1" y="247" width="884" height="16"/> <autoresizingMask key="autoresizingMask"/> <animations/> </scroller> - <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="5LV-7H-phB"> - <rect key="frame" x="-100" y="-100" width="15" height="206"/> + <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="1ow-7B-J0g"> + <rect key="frame" x="224" y="17" width="15" height="102"/> <autoresizingMask key="autoresizingMask"/> <animations/> </scroller> - <tableHeaderView key="headerView" id="GLD-lI-qeh"> - <rect key="frame" x="0.0" y="0.0" width="884" height="17"/> + <tableHeaderView key="headerView" id="jdT-w6-s4n"> + <rect key="frame" x="0.0" y="0.0" width="884" height="23"/> <autoresizingMask key="autoresizingMask"/> <animations/> </tableHeaderView> </scrollView> - <button verticalHuggingPriority="750" id="vFP-nq-IQg"> - <rect key="frame" x="110" y="288" width="140" height="28"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <animations/> - <buttonCell key="cell" type="push" title="Configure Defaults…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="aYF-d5-Ya6"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="smallSystem"/> - </buttonCell> - <connections> - <action selector="showSettingsSheet:" target="-2" id="D9K-M3-zHd"/> - <binding destination="-2" name="enabled" keyPath="self.audio" id="cWq-t8-vFR"> - <dictionary key="options"> - <string key="NSValueTransformerName">NSIsNotNil</string> - </dictionary> - </binding> - </connections> - </button> - <button verticalHuggingPriority="750" id="wcL-rL-aYS"> - <rect key="frame" x="248" y="288" width="116" height="28"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <animations/> - <buttonCell key="cell" type="push" title="Reload Defaults" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="q2P-Tg-cBJ"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="smallSystem"/> - </buttonCell> - <connections> - <action selector="reloadDefaults:" target="-2" id="k9I-I9-T2U"/> - <binding destination="-2" name="enabled" keyPath="self.audio" id="sJS-am-vnf"> - <dictionary key="options"> - <string key="NSValueTransformerName">NSIsNotNil</string> - </dictionary> - </binding> - </connections> - </button> - <popUpButton verticalHuggingPriority="750" id="jrP-M5-2Rq"> - <rect key="frame" x="17" y="291" width="88" height="22"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <animations/> - <popUpButtonCell key="cell" type="push" title="Track" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="AoT-G9-aA4"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="smallSystem"/> - <menu key="menu" title="OtherViews" id="Vxo-66-Mrx"> - <items> - <menuItem title="Track" state="on" hidden="YES" id="Pfh-Bc-83k"/> - <menuItem title="Add All" id="AMA-Ul-v2f"> - <connections> - <action selector="addAllAudioTracks:" target="-2" id="8LO-bD-Fjy"/> - </connections> - </menuItem> - <menuItem isSeparatorItem="YES" id="CCk-3A-ULa"/> - <menuItem title="Remove All" id="YlA-ue-5oE"> - <connections> - <action selector="removeAll:" target="-2" id="Hbr-n5-nOt"/> - </connections> - </menuItem> - </items> - </menu> - </popUpButtonCell> - <connections> - <binding destination="-2" name="enabled" keyPath="self.audio" id="vyM-YV-Yqi"> - <dictionary key="options"> - <string key="NSValueTransformerName">NSIsNotNil</string> - </dictionary> - </binding> - </connections> - </popUpButton> </subviews> <animations/> - <point key="canvasLocation" x="145" y="440"/> + <point key="canvasLocation" x="628" y="206"/> </view> - <userDefaultsController representsSharedInstance="YES" id="ee3-5O-TtC"/> <menu id="hyy-qd-qpe"> <items> <menuItem title="Add All" id="HM0-a4-pm5"> diff --git a/macosx/HBAudioTrack.m b/macosx/HBAudioTrack.m index a30f7eafb..7a6eb725e 100644 --- a/macosx/HBAudioTrack.m +++ b/macosx/HBAudioTrack.m @@ -563,8 +563,12 @@ static NSMutableArray *masterBitRateArray = nil; return retval; } -#pragma mark - -#pragma mark Bindings Support +#pragma mark - Bindings Support + +- (NSArray *)masterTrackArray +{ + return self.dataSource.masterTrackArray; +} - (BOOL)enabled { @@ -635,6 +639,14 @@ static NSMutableArray *masterBitRateArray = nil; return retval; } +- (void)setNilValueForKey:(NSString *)key +{ + if ([key isEqualToString:@"drc"] || [key isEqualToString:@"gain"]) + { + [self setValue:@0 forKey:key]; + } +} + + (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key { NSSet *retval = nil; |