vlc | branch: master | David Fuhrmann <[email protected]> | Sun Dec 4 13:48:38 2016 +0100| [3f511aeddda18d22671da69e759875e3843ceb1c] | committer: David Fuhrmann
macosx: Remove spdif checkbox from simple audio preferences > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3f511aeddda18d22671da69e759875e3843ceb1c --- .../Resources/English.lproj/SimplePreferences.xib | 105 +++++---------------- modules/gui/macosx/simple_prefs.h | 1 - modules/gui/macosx/simple_prefs.m | 4 - 3 files changed, 26 insertions(+), 84 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/SimplePreferences.xib b/extras/package/macosx/Resources/English.lproj/SimplePreferences.xib index a32e182..257fcc0 100644 --- a/extras/package/macosx/Resources/English.lproj/SimplePreferences.xib +++ b/extras/package/macosx/Resources/English.lproj/SimplePreferences.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="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="15G1211" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> - <deployment version="1070" identifier="macosx"/> + <deployment identifier="macosx"/> <development version="7000" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/> <capability name="box content view" minToolsVersion="7.0"/> </dependencies> <objects> @@ -26,7 +26,6 @@ <outlet property="audio_lastpwdSecureTextField" destination="2369" id="kA9-kY-zVK"/> <outlet property="audio_lastuserLabel" destination="2366" id="7TM-ZF-b6k"/> <outlet property="audio_lastuserTextField" destination="2367" id="BqY-8J-J27"/> - <outlet property="audio_spdifCheckbox" destination="2338" id="yfj-aj-WyJ"/> <outlet property="audio_visualLabel" destination="2357" id="7D5-Jn-WXF"/> <outlet property="audio_visualPopup" destination="2358" id="EUk-rS-5wJ"/> <outlet property="audio_volSlider" destination="2335" id="uaQ-MT-Ra9"/> @@ -167,7 +166,7 @@ <rect key="frame" x="0.0" y="0.0" width="570" height="38"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <box title="Title" boxType="oldStyle" borderType="none" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="2410"> + <box boxType="oldStyle" borderType="none" title="Title" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="2410"> <rect key="frame" x="0.0" y="-2" width="570" height="40"/> <view key="contentView" id="uTV-TS-NBc"> <rect key="frame" x="0.0" y="0.0" width="570" height="40"/> @@ -236,8 +235,6 @@ Gw <constraints> <constraint firstAttribute="height" constant="40" id="FeC-YL-hWD"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> </subviews> <constraints> @@ -252,7 +249,7 @@ Gw <rect key="frame" x="0.0" y="0.0" width="570" height="571"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <box title="General Settings" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="kup-aY-Wqq"> + <box borderType="line" title="General Settings" translatesAutoresizingMaskIntoConstraints="NO" id="kup-aY-Wqq"> <rect key="frame" x="18" y="433" width="536" height="117"/> <view key="contentView" id="wFl-aV-3Hn"> <rect key="frame" x="1" y="1" width="534" height="101"/> @@ -348,8 +345,6 @@ Gw <constraint firstAttribute="width" constant="530" id="BqS-Ab-rri"/> <constraint firstAttribute="height" constant="113" id="Gbi-aT-8VK"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <box title="Privacy / Network Interaction" translatesAutoresizingMaskIntoConstraints="NO" id="2318"> <rect key="frame" x="18" y="86" width="534" height="107"/> @@ -399,8 +394,6 @@ Gw <constraints> <constraint firstAttribute="height" constant="103" id="A8P-64-2X1"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <box title="Playback control" translatesAutoresizingMaskIntoConstraints="NO" id="CZP-ZN-k6p"> <rect key="frame" x="18" y="287" width="534" height="142"/> @@ -474,10 +467,8 @@ Gw <constraints> <constraint firstAttribute="height" constant="138" id="XGx-54-nEj"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> - <box title="Playback behaviour" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="EKZ-iB-CMo"> + <box borderType="line" title="Playback behaviour" translatesAutoresizingMaskIntoConstraints="NO" id="EKZ-iB-CMo"> <rect key="frame" x="18" y="197" width="534" height="86"/> <view key="contentView" id="BMS-wa-oJS"> <rect key="frame" x="1" y="1" width="532" height="70"/> @@ -525,10 +516,8 @@ Gw <constraint firstAttribute="bottom" secondItem="3911" secondAttribute="bottom" constant="11" id="PWH-HQ-Y6B"/> <constraint firstAttribute="height" constant="82" id="rRS-wr-FCF"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> - <box title="lua" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="drh-ot-Vyn"> + <box borderType="line" title="lua" translatesAutoresizingMaskIntoConstraints="NO" id="drh-ot-Vyn"> <rect key="frame" x="17" y="16" width="536" height="64"/> <view key="contentView" id="Who-VF-GbQ"> <rect key="frame" x="1" y="1" width="534" height="48"/> @@ -563,8 +552,6 @@ Gw <constraint firstAttribute="height" constant="60" id="Hpz-Ev-sCZ"/> <constraint firstAttribute="width" constant="530" id="yQf-88-Z0F"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> </subviews> <constraints> @@ -592,11 +579,11 @@ Gw <point key="canvasLocation" x="245" y="252.5"/> </customView> <customView id="2330" userLabel="Audio"> - <rect key="frame" x="0.0" y="0.0" width="569" height="448"/> + <rect key="frame" x="0.0" y="0.0" width="569" height="432"/> <autoresizingMask key="autoresizingMask"/> <subviews> <box title="Last.fm" translatesAutoresizingMaskIntoConstraints="NO" id="2363"> - <rect key="frame" x="17" y="12" width="535" height="117"/> + <rect key="frame" x="17" y="16" width="535" height="117"/> <view key="contentView" id="7U2-xM-E1M"> <rect key="frame" x="2" y="2" width="531" height="100"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> @@ -675,11 +662,9 @@ Gw <constraint firstAttribute="width" constant="529" id="WQm-75-tFY"/> <constraint firstAttribute="height" constant="113" id="zt6-pF-b6b"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <box title="Effects" translatesAutoresizingMaskIntoConstraints="NO" id="2347"> - <rect key="frame" x="17" y="135" width="535" height="60"/> + <rect key="frame" x="17" y="139" width="535" height="60"/> <view key="contentView" id="N65-iQ-8gY"> <rect key="frame" x="2" y="2" width="531" height="43"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> @@ -724,17 +709,15 @@ Gw <constraint firstAttribute="width" constant="529" id="Opg-eP-4p5"/> <constraint firstAttribute="height" constant="56" id="XaP-RX-Jwx"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <box title="General Audio" translatesAutoresizingMaskIntoConstraints="NO" id="2332"> - <rect key="frame" x="17" y="201" width="535" height="204"/> + <rect key="frame" x="17" y="205" width="535" height="184"/> <view key="contentView" id="sX1-um-Nbr"> - <rect key="frame" x="2" y="2" width="531" height="187"/> + <rect key="frame" x="2" y="2" width="531" height="167"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2335"> - <rect key="frame" x="250" y="102" width="209" height="20"/> + <rect key="frame" x="250" y="82" width="209" height="20"/> <sliderCell key="cell" continuous="YES" alignment="left" maxValue="200" doubleValue="100" tickMarkPosition="above" sliderType="linear" id="3459"> <font key="font" size="12" name="Helvetica"/> </sliderCell> @@ -743,7 +726,7 @@ Gw </connections> </slider> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2336"> - <rect key="frame" x="465" y="101" width="46" height="22"/> + <rect key="frame" x="465" y="81" width="46" height="22"/> <constraints> <constraint firstAttribute="width" constant="46" id="96N-ME-SLD"/> </constraints> @@ -771,18 +754,8 @@ Gw <outlet property="nextKeyView" destination="2346" id="3424"/> </connections> </textField> - <button translatesAutoresizingMaskIntoConstraints="NO" id="2338"> - <rect key="frame" x="10" y="78" width="183" height="18"/> - <buttonCell key="cell" type="check" title="Use S/PDIF when available" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3461"> - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - <connections> - <action selector="audioSettingChanged:" target="-2" id="IQO-wt-n7G"/> - </connections> - </button> <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2339"> - <rect key="frame" x="10" y="50" width="238" height="17"/> + <rect key="frame" x="9" y="56" width="239" height="17"/> <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Force detection of Dolby Surround" id="3462"> <font key="font" metaFont="system"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> @@ -790,7 +763,7 @@ Gw </textFieldCell> </textField> <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2340"> - <rect key="frame" x="250" y="45" width="185" height="26"/> + <rect key="frame" x="250" y="51" width="185" height="26"/> <constraints> <constraint firstAttribute="width" constant="180" id="m4P-Bj-cCf"/> </constraints> @@ -810,7 +783,7 @@ Gw </connections> </popUpButton> <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2345"> - <rect key="frame" x="10" y="16" width="238" height="17"/> + <rect key="frame" x="9" y="22" width="239" height="17"/> <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Preferred Audio language" id="3464"> <font key="font" metaFont="system"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> @@ -818,7 +791,7 @@ Gw </textFieldCell> </textField> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2346"> - <rect key="frame" x="252" y="14" width="259" height="22"/> + <rect key="frame" x="252" y="20" width="259" height="22"/> <constraints> <constraint firstAttribute="width" constant="259" id="8Te-oS-vOQ"/> </constraints> @@ -832,7 +805,7 @@ Gw </connections> </textField> <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3664"> - <rect key="frame" x="12" y="129" width="499" height="48"/> + <rect key="frame" x="12" y="109" width="499" height="48"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> <size key="cellSize" width="499" height="23"/> <size key="intercellSpacing" width="4" height="2"/> @@ -865,37 +838,33 @@ Gw </subviews> <constraints> <constraint firstItem="2339" firstAttribute="centerY" secondItem="2340" secondAttribute="centerY" id="4RC-SX-1jq"/> - <constraint firstItem="2338" firstAttribute="leading" secondItem="2339" secondAttribute="leading" id="5yl-6t-xUn"/> <constraint firstItem="2345" firstAttribute="centerY" secondItem="2346" secondAttribute="centerY" id="89p-ax-4G2"/> <constraint firstItem="2346" firstAttribute="top" secondItem="2340" secondAttribute="bottom" constant="12" id="Egv-Ad-aCt"/> <constraint firstItem="2346" firstAttribute="leading" secondItem="sX1-um-Nbr" secondAttribute="leading" constant="252" id="J2l-2v-xBO"/> <constraint firstItem="2339" firstAttribute="leading" secondItem="2345" secondAttribute="leading" id="Jvf-j0-oQA"/> - <constraint firstItem="2338" firstAttribute="leading" secondItem="sX1-um-Nbr" secondAttribute="leading" constant="12" id="M5c-7s-upC"/> <constraint firstItem="2345" firstAttribute="trailing" secondItem="2339" secondAttribute="trailing" id="OED-pN-dL5"/> <constraint firstItem="2346" firstAttribute="leading" secondItem="2340" secondAttribute="leading" id="WZx-n4-rgd"/> <constraint firstItem="2340" firstAttribute="leading" secondItem="2339" secondAttribute="trailing" constant="6" id="YFL-YQ-MVY"/> - <constraint firstItem="2339" firstAttribute="top" secondItem="2338" secondAttribute="bottom" constant="13" id="Ym8-4T-g6Z"/> + <constraint firstItem="2339" firstAttribute="top" secondItem="2335" secondAttribute="bottom" constant="11" id="bCe-7y-1Xv"/> <constraint firstItem="2335" firstAttribute="leading" secondItem="sX1-um-Nbr" secondAttribute="leading" constant="252" id="efV-6F-44H"/> <constraint firstItem="2336" firstAttribute="leading" secondItem="2335" secondAttribute="trailing" constant="8" id="etL-aD-xyO"/> <constraint firstItem="2336" firstAttribute="trailing" secondItem="2346" secondAttribute="trailing" id="hsX-v8-qU8"/> + <constraint firstItem="2339" firstAttribute="leading" secondItem="sX1-um-Nbr" secondAttribute="leading" constant="11" id="irs-Mc-EXZ"/> <constraint firstItem="2340" firstAttribute="leading" secondItem="2335" secondAttribute="leading" id="lma-5t-iwF"/> <constraint firstItem="2335" firstAttribute="top" secondItem="3664" secondAttribute="bottom" constant="9" id="sPL-qO-v2S"/> <constraint firstItem="2336" firstAttribute="centerY" secondItem="2335" secondAttribute="centerY" id="tpS-N0-gGA"/> <constraint firstItem="2335" firstAttribute="leading" secondItem="sX1-um-Nbr" secondAttribute="leading" constant="252" id="y91-mp-0ZJ"/> - <constraint firstItem="2338" firstAttribute="top" secondItem="2335" secondAttribute="bottom" constant="10" id="zzg-xw-8i9"/> </constraints> </view> <constraints> <constraint firstItem="3664" firstAttribute="leading" secondItem="2332" secondAttribute="leading" constant="11" id="Efn-94-ybA"/> - <constraint firstAttribute="height" constant="200" id="Jpc-Wz-hA7"/> + <constraint firstAttribute="height" constant="180" id="Jpc-Wz-hA7"/> <constraint firstAttribute="width" constant="529" id="LEg-Z7-F1m"/> <constraint firstItem="3664" firstAttribute="top" secondItem="2332" secondAttribute="top" constant="25" id="yNh-fk-NdY"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <button translatesAutoresizingMaskIntoConstraints="NO" id="2331"> - <rect key="frame" x="18" y="412" width="101" height="18"/> + <rect key="frame" x="18" y="396" width="101" height="18"/> <buttonCell key="cell" type="check" title="Enable Audio" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3457"> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <font key="font" metaFont="system"/> @@ -916,6 +885,7 @@ Gw <constraint firstItem="2358" firstAttribute="leading" secondItem="2346" secondAttribute="leading" id="y6F-Dr-2A9"/> <constraint firstItem="2332" firstAttribute="leading" secondItem="2330" secondAttribute="leading" constant="20" id="yCl-al-Jh8"/> </constraints> + <point key="canvasLocation" x="244.5" y="823"/> </customView> <customView id="2440" userLabel="Video"> <rect key="frame" x="0.0" y="0.0" width="570" height="497"/> @@ -982,8 +952,6 @@ Gw <constraints> <constraint firstAttribute="height" constant="100" id="AXh-Lg-eG2"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <box title="Fullscreen" translatesAutoresizingMaskIntoConstraints="NO" id="9CN-jv-NQ1"> <rect key="frame" x="17" y="229" width="536" height="118"/> @@ -1062,8 +1030,6 @@ Gw <constraint firstAttribute="height" constant="114" id="X60-cS-OXa"/> <constraint firstItem="74n-z2-A2G" firstAttribute="leading" secondItem="9CN-jv-NQ1" secondAttribute="leading" constant="185" id="fAd-OT-LbT"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <button translatesAutoresizingMaskIntoConstraints="NO" id="2448"> <rect key="frame" x="18" y="461" width="101" height="18"/> @@ -1075,7 +1041,7 @@ Gw <action selector="videoSettingChanged:" target="-2" id="BYl-tW-BeB"/> </connections> </button> - <box autoresizesSubviews="NO" title="Video" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="3722"> + <box autoresizesSubviews="NO" borderType="line" title="Video" translatesAutoresizingMaskIntoConstraints="NO" id="3722"> <rect key="frame" x="17" y="136" width="536" height="89"/> <view key="contentView" id="Kie-O4-kEN"> <rect key="frame" x="1" y="1" width="534" height="73"/> @@ -1145,8 +1111,6 @@ Gw <constraints> <constraint firstAttribute="height" constant="85" id="FvW-7N-4Bf"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <box title="Video snapshots" translatesAutoresizingMaskIntoConstraints="NO" id="2466"> <rect key="frame" x="17" y="16" width="536" height="116"/> @@ -1266,8 +1230,6 @@ Gw <constraints> <constraint firstAttribute="height" constant="112" id="1Oq-ba-b9I"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> </subviews> <constraints> @@ -1351,8 +1313,6 @@ Gw <constraints> <constraint firstAttribute="height" constant="84" id="NNh-rQ-Kq7"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <box title="Codecs / Muxers" translatesAutoresizingMaskIntoConstraints="NO" id="2585"> <rect key="frame" x="17" y="16" width="538" height="184"/> @@ -1510,8 +1470,6 @@ Gw <constraint firstAttribute="height" constant="180" id="8KJ-6M-0pY"/> <constraint firstItem="3862" firstAttribute="top" secondItem="2585" secondAttribute="top" constant="25" id="HbP-Ji-or1"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <box title="Network" translatesAutoresizingMaskIntoConstraints="NO" id="2563"> <rect key="frame" x="17" y="300" width="538" height="60"/> @@ -1537,10 +1495,8 @@ Gw <constraint firstAttribute="trailing" secondItem="3742" secondAttribute="trailing" constant="16" id="tGu-zJ-RHQ"/> <constraint firstAttribute="height" constant="56" id="ymx-sx-dSh"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> - <box autoresizesSubviews="NO" title="Record directory or filename" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="3623"> + <box autoresizesSubviews="NO" borderType="line" title="Record directory or filename" translatesAutoresizingMaskIntoConstraints="NO" id="3623"> <rect key="frame" x="17" y="364" width="538" height="62"/> <view key="contentView" id="7b2-vV-8CM"> <rect key="frame" x="1" y="1" width="536" height="46"/> @@ -1579,8 +1535,6 @@ Gw <constraint firstAttribute="height" constant="58" id="GeB-rm-End"/> <constraint firstItem="3614" firstAttribute="leading" secondItem="3623" secondAttribute="leading" constant="16" id="YUQ-6L-lr3"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> </subviews> <constraints> @@ -1834,8 +1788,6 @@ Gw <constraints> <constraint firstAttribute="height" constant="209" id="uru-hw-RLx"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <box title="On Screen Display" translatesAutoresizingMaskIntoConstraints="NO" id="2524"> <rect key="frame" x="17" y="328" width="536" height="53"/> @@ -1863,8 +1815,6 @@ Gw <constraint firstAttribute="width" constant="530" id="ct6-R7-b2D"/> <constraint firstAttribute="height" constant="49" id="eoD-hC-Acl"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <box title="SPU language" translatesAutoresizingMaskIntoConstraints="NO" id="1aw-Yd-yzY"> <rect key="frame" x="17" y="235" width="536" height="87"/> @@ -1939,8 +1889,6 @@ Gw <constraint firstAttribute="height" constant="83" id="B0j-0b-aJk"/> <constraint firstAttribute="width" constant="530" id="Wd6-3Z-WXV"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> </subviews> <constraints> @@ -2004,7 +1952,6 @@ Gw </connections> </tableView> </subviews> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> </clipView> <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="3540"> <rect key="frame" x="1" y="294" width="528" height="15"/> diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h index c6fdeb5..593cc6c 100644 --- a/modules/gui/macosx/simple_prefs.h +++ b/modules/gui/macosx/simple_prefs.h @@ -41,7 +41,6 @@ @property (readwrite, weak) IBOutlet NSTextField *audio_lastpwdLabel; @property (readwrite, weak) IBOutlet NSTextField *audio_lastuserTextField; @property (readwrite, weak) IBOutlet NSTextField *audio_lastuserLabel; -@property (readwrite, weak) IBOutlet NSButton *audio_spdifCheckbox; @property (readwrite, weak) IBOutlet NSView *audioView; @property (readwrite, weak) IBOutlet NSPopUpButton *audio_visualPopup; @property (readwrite, weak) IBOutlet NSTextField *audio_visualLabel; diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index 9b3057e..75fec12 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -324,7 +324,6 @@ create_toolbar_item(NSString *itemIdent, NSString *name, NSString *desc, NSStrin [_audio_lastCheckbox setTitle: _NS("Enable Last.fm submissions")]; [_audio_lastpwdLabel setStringValue: _NS("Password")]; [_audio_lastuserLabel setStringValue: _NS("Username")]; - [_audio_spdifCheckbox setTitle: _NS("Use S/PDIF when available")]; [_audio_visualLabel setStringValue: _NS("Visualization")]; [_audio_autosavevol_yesButtonCell setTitle: _NS("Keep audio level between sessions")]; [_audio_autosavevol_noButtonCell setTitle: _NS("Always reset audio start level to:")]; @@ -643,8 +642,6 @@ static inline const char * __config_GetLabel(vlc_object_t *p_this, const char *p [_audio_volTextField setIntValue: i]; } - [self setupButton:_audio_spdifCheckbox forBoolValue: "spdif"]; - [self setupButton:_audio_dolbyPopup forIntList: "force-dolby-surround"]; [self setupField:_audio_langTextField forOption: "audio-language"]; @@ -971,7 +968,6 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha config_PutInt(p_intf, "audio", [_audio_enableCheckbox state]); config_PutInt(p_intf, "volume-save", [_audio_autosavevol_yesButtonCell state]); var_SetBool(p_intf, "volume-save", [_audio_autosavevol_yesButtonCell state]); - config_PutInt(p_intf, "spdif", [_audio_spdifCheckbox state]); if ([_audio_volTextField isEnabled]) config_PutInt(p_intf, "auhal-volume", ([_audio_volTextField intValue] * AOUT_VOLUME_MAX) / 200); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
