diff options
author | Damiano Galassi <damiog@gmail.com> | 2016-05-03 18:47:14 +0200 |
---|---|---|
committer | Damiano Galassi <damiog@gmail.com> | 2016-05-03 18:47:14 +0200 |
commit | e53308f9342d911a9d3e8f4d1eeba6e53fabc0ab (patch) | |
tree | f65f5390d9174276022790a308660e17d7a3601f /macosx/English.lproj | |
parent | 4ab21a0ca630dc4bac79149a6eec598921899fe5 (diff) |
MacGui: use AVFoundation as the first option for the preview playback. Add volume and tracks controls to the player hud.
Diffstat (limited to 'macosx/English.lproj')
-rw-r--r-- | macosx/English.lproj/HBPictureViewController.xib | 22 | ||||
-rw-r--r-- | macosx/English.lproj/PicturePreview.xib | 252 |
2 files changed, 13 insertions, 261 deletions
diff --git a/macosx/English.lproj/HBPictureViewController.xib b/macosx/English.lproj/HBPictureViewController.xib index 9d12a5738..6c4b0686f 100644 --- a/macosx/English.lproj/HBPictureViewController.xib +++ b/macosx/English.lproj/HBPictureViewController.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="10115" systemVersion="15E61b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F24b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> <dependencies> <deployment identifier="macosx"/> <development version="6300" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10115"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="HBPictureViewController"> @@ -50,7 +50,7 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> <size key="cellSize" width="90" height="20"/> <size key="intercellSpacing" width="2" height="3"/> - <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" controlSize="small" inset="2" id="S7K-vF-t1n" customClass="HBHUDButtonCell"> + <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" controlSize="small" inset="2" id="S7K-vF-t1n"> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <font key="font" metaFont="smallSystem"/> </buttonCell> @@ -678,7 +678,7 @@ Players will scale the image in order to achieve the specified aspect.</string> <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="FwZ-6T-zJe"> <rect key="frame" x="151" y="281" width="15" height="22"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="64" id="NP7-P2-Qga"> + <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="59" id="NP7-P2-Qga"> <font key="font" metaFont="smallSystem"/> </stepperCell> <connections> @@ -952,7 +952,7 @@ Players will scale the image in order to achieve the specified aspect.</string> <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="2s0-5k-fjU"> <rect key="frame" x="240" y="281" width="15" height="22"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="64" id="MwK-aS-Oaf"> + <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="59" id="MwK-aS-Oaf"> <font key="font" metaFont="smallSystem"/> </stepperCell> <connections> @@ -1192,17 +1192,17 @@ If a deinterlace filter is enabled, only frames that this filter finds to be int </popUpButtonCell> <connections> <accessibilityConnection property="title" destination="Mg1-Yq-F9S" id="nhI-oN-u5h"/> - <binding destination="-2" name="contentValues" keyPath="self.filters.combDetectionSettings" id="lKn-uj-nGl"/> - <binding destination="-2" name="selectedValue" keyPath="self.filters.combDetection" previousBinding="lKn-uj-nGl" id="XIZ-dC-cLu"> + <binding destination="-2" name="enabled" keyPath="self.filters" id="mJ8-zq-tQ8"> <dictionary key="options"> - <string key="NSValueTransformerName">HBCombDetectionTransformer</string> + <string key="NSValueTransformerName">NSIsNotNil</string> </dictionary> </binding> - <binding destination="-2" name="enabled" keyPath="self.filters" id="mJ8-zq-tQ8"> + <binding destination="-2" name="selectedValue" keyPath="self.filters.combDetection" previousBinding="lKn-uj-nGl" id="XIZ-dC-cLu"> <dictionary key="options"> - <string key="NSValueTransformerName">NSIsNotNil</string> + <string key="NSValueTransformerName">HBCombDetectionTransformer</string> </dictionary> </binding> + <binding destination="-2" name="contentValues" keyPath="self.filters.combDetectionSettings" id="lKn-uj-nGl"/> <outlet property="nextKeyView" destination="rPg-F2-gtl" id="46r-ZD-dTe"/> </connections> </popUpButton> @@ -1216,12 +1216,12 @@ If a deinterlace filter is enabled, only frames that this filter finds to be int </textFieldCell> <accessibility description="Custom interlace detection settings."/> <connections> + <binding destination="-2" name="value" keyPath="self.filters.combDetectionCustomString" id="pTK-PZ-3ZE"/> <binding destination="-2" name="hidden" keyPath="self.filters.customCombDetectionSelected" id="avq-Zl-5gA"> <dictionary key="options"> <string key="NSValueTransformerName">NSNegateBoolean</string> </dictionary> </binding> - <binding destination="-2" name="value" keyPath="self.filters.combDetectionCustomString" id="pTK-PZ-3ZE"/> </connections> </textField> </subviews> diff --git a/macosx/English.lproj/PicturePreview.xib b/macosx/English.lproj/PicturePreview.xib index 77013fe9f..3550b20f6 100644 --- a/macosx/English.lproj/PicturePreview.xib +++ b/macosx/English.lproj/PicturePreview.xib @@ -1,28 +1,13 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9052" systemVersion="15B30a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F24b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> <dependencies> <deployment identifier="macosx"/> <development version="6300" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9052"/> - <plugIn identifier="com.apple.QTKitIBPlugin" version="9052"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="HBPreviewController"> <connections> - <outlet property="fEncodingControlBox" destination="F8A-dU-Y1l" id="s29-SQ-WXg"/> - <outlet property="fInfoField" destination="38" id="73"/> - <outlet property="fMovieCreationProgressIndicator" destination="213" id="214"/> - <outlet property="fMovieInfoField" destination="372" id="374"/> - <outlet property="fMoviePlaybackControlBox" destination="COi-Ia-2yt" id="dcQ-Bp-1jG"/> - <outlet property="fMovieScrubberSlider" destination="341" id="371"/> - <outlet property="fMovieView" destination="207" id="208"/> - <outlet property="fPictureControlBox" destination="2me-4k-EDi" id="ABj-KD-Z3U"/> - <outlet property="fPictureSlider" destination="209" id="211"/> - <outlet property="fPlayPauseButton" destination="361" id="364"/> - <outlet property="fPreviewMovieLengthPopUp" destination="226" id="232"/> - <outlet property="fPreviewMovieStatusField" destination="223" id="225"/> - <outlet property="fScaleToScreenToggleButton" destination="275" id="yX0-fL-6J9"/> - <outlet property="fscaleInfoField" destination="280" id="282"/> <outlet property="previewView" destination="ooo-9X-9Al" id="als-Lt-aVz"/> <outlet property="window" destination="5" id="184"/> </connections> @@ -41,235 +26,8 @@ <customView id="ooo-9X-9Al" customClass="HBPreviewView"> <rect key="frame" x="0.0" y="0.0" width="500" height="360"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <animations/> - </customView> - <qtMovieView preservesAspectRatio="YES" id="207"> - <rect key="frame" x="0.0" y="0.0" width="500" height="360"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <animations/> - <color key="fillColor" red="0.80000000999999998" green="0.80000000999999998" blue="0.80000000999999998" alpha="1" colorSpace="calibratedRGB"/> - </qtMovieView> - <customView id="2me-4k-EDi" userLabel="Picture Controls" customClass="HBHUDView"> - <rect key="frame" x="20" y="136" width="460" height="100"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <subviews> - <button toolTip="Encode And Play Back A Live Preview At Your Current Settings" verticalHuggingPriority="750" id="215"> - <rect key="frame" x="17" y="11" width="80" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <animations/> - <buttonCell key="cell" type="push" title="Live Preview" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="216"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - </buttonCell> - <connections> - <action selector="createMoviePreview:" target="-2" id="218"/> - </connections> - </button> - <button toolTip="Show Picture Settings Inspector" verticalHuggingPriority="750" id="271"> - <rect key="frame" x="378" y="11" width="61" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> - <animations/> - <buttonCell key="cell" type="push" title="Settings" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="272"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - </buttonCell> - <connections> - <action selector="showPictureSettings:" target="-2" id="274"/> - </connections> - </button> - <button toolTip="Scale Preview To Screen" verticalHuggingPriority="750" id="275"> - <rect key="frame" x="276" y="11" width="96" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> - <animations/> - <buttonCell key="cell" type="push" title="Scale To Screen" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="276"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - </buttonCell> - <connections> - <action selector="toggleScaleToScreen:" target="-2" id="279"/> - </connections> - </button> - <textField verticalHuggingPriority="750" id="234"> - <rect key="frame" x="105" y="14" width="48" height="11"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> - <animations/> - <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Duration:" id="235"> - <font key="font" metaFont="miniSystemBold"/> - <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField verticalHuggingPriority="750" id="q81-Om-Azd"> - <rect key="frame" x="211" y="14" width="21" height="11"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> - <animations/> - <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="sec" id="APs-l9-qFj"> - <font key="font" metaFont="miniSystemBold"/> - <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <popUpButton toolTip="Select The Length Of Live Preview to Encode" verticalHuggingPriority="750" id="226"> - <rect key="frame" x="158" y="12" width="49" height="15"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> - <animations/> - <popUpButtonCell key="cell" type="push" title="240" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="231" id="227"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - <menu key="menu" title="OtherViews" id="228"> - <items> - <menuItem title="240" state="on" id="231"/> - </items> - </menu> - </popUpButtonCell> - <connections> - <action selector="previewDurationPopUpChanged:" target="-2" id="233"/> - </connections> - </popUpButton> - <slider verticalHuggingPriority="750" id="209"> - <rect key="frame" x="18" y="39" width="420" height="16"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> - <animations/> - <sliderCell key="cell" controlSize="mini" continuous="YES" alignment="left" maxValue="9" tickMarkPosition="above" numberOfTickMarks="10" allowsTickMarkValuesOnly="YES" sliderType="linear" id="210"> - <font key="font" metaFont="miniSystem"/> - </sliderCell> - <connections> - <action selector="pictureSliderChanged:" target="-2" id="212"/> - </connections> - </slider> - <textField verticalHuggingPriority="750" id="38"> - <rect key="frame" x="15" y="55" width="430" height="20"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> - <animations/> - <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" id="165"> - <font key="font" metaFont="smallSystemBold"/> - <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField verticalHuggingPriority="750" id="280"> - <rect key="frame" x="15" y="77" width="426" height="12"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> - <animations/> - <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" id="281"> - <font key="font" metaFont="miniSystemBold"/> - <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - </subviews> - <animations/> - </customView> - <customView hidden="YES" id="COi-Ia-2yt" userLabel="Playback Controls" customClass="HBHUDView"> - <rect key="frame" x="20" y="32" width="460" height="100"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <subviews> - <slider verticalHuggingPriority="750" id="341"> - <rect key="frame" x="18" y="17" width="337" height="21"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> - <animations/> - <sliderCell key="cell" continuous="YES" alignment="left" maxValue="100" tickMarkPosition="above" sliderType="linear" id="346"/> - <connections> - <action selector="previewScrubberChanged:" target="-2" id="384"/> - </connections> - </slider> - <button toolTip="Toggle Play/Pause" id="361"> - <rect key="frame" x="207" y="44" width="36" height="36"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <animations/> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="play-p" imagePosition="only" alignment="center" alternateImage="pause-p" imageScaling="proportionallyDown" id="362"> - <behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - <connections> - <action selector="toggleMoviePreviewPlayPause:" target="-2" id="370"/> - </connections> - </button> - <button toolTip="Go To Beginning" id="375"> - <rect key="frame" x="165" y="49" width="32" height="26"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <animations/> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="prev-p" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" id="376"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - <connections> - <action selector="moviePlaybackGoToBeginning:" target="-2" id="382"/> - </connections> - </button> - <button toolTip="Go To End" id="378"> - <rect key="frame" x="253" y="49" width="32" height="26"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <animations/> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="next-p" imagePosition="only" alignment="center" controlSize="mini" imageScaling="proportionallyDown" id="379"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - </buttonCell> - <connections> - <action selector="moviePlaybackGoToEnd:" target="-2" id="383"/> - </connections> - </button> - <button toolTip="Show Still Previews" verticalHuggingPriority="750" id="365"> - <rect key="frame" x="350" y="54" width="81" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <animations/> - <buttonCell key="cell" type="push" title="Still Previews" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="366"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - </buttonCell> - <connections> - <action selector="showPicturesPreview:" target="-2" id="396"/> - </connections> - </button> - <textField verticalHuggingPriority="750" id="372"> - <rect key="frame" x="349" y="20" width="94" height="14"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> - <animations/> - <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="right" title="00:00:00" id="373"> - <font key="font" metaFont="smallSystemBold"/> - <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - </subviews> - <animations/> - </customView> - <customView hidden="YES" id="F8A-dU-Y1l" userLabel="Encoding Controls" customClass="HBHUDView"> - <rect key="frame" x="20" y="240" width="460" height="100"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <subviews> - <textField verticalHuggingPriority="750" id="223"> - <rect key="frame" x="17" y="60" width="425" height="14"/> - <autoresizingMask key="autoresizingMask"/> - <animations/> - <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Preparing Preview" id="224"> - <font key="font" metaFont="smallSystemBold"/> - <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - <color key="backgroundColor" red="0.90196085000000004" green="0.90196085000000004" blue="0.90196085000000004" alpha="0.0" colorSpace="deviceRGB"/> - </textFieldCell> - </textField> - <progressIndicator verticalHuggingPriority="750" maxValue="1" bezeled="NO" indeterminate="YES" controlSize="small" style="bar" id="213"> - <rect key="frame" x="20" y="27" width="346" height="12"/> - <autoresizingMask key="autoresizingMask"/> - <animations/> - </progressIndicator> - <button toolTip="Cancel Live Preview Encode" verticalHuggingPriority="750" id="261"> - <rect key="frame" x="383" y="25" width="58" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> - <animations/> - <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="262"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - </buttonCell> - <connections> - <action selector="cancelCreateMoviePreview:" target="-2" id="395"/> - </connections> - </button> - </subviews> - <animations/> </customView> </subviews> - <animations/> </view> <connections> <outlet property="delegate" destination="-2" id="7iq-HC-WuX"/> @@ -277,10 +35,4 @@ <point key="canvasLocation" x="-182" y="-40"/> </window> </objects> - <resources> - <image name="next-p" width="48" height="48"/> - <image name="pause-p" width="48" height="48"/> - <image name="play-p" width="48" height="48"/> - <image name="prev-p" width="48" height="48"/> - </resources> </document> |