Skip to content

V
vlc
Commit 2426d13b authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: replace avcodec-hw hack by proper settings

parent be1b32c8
Show whitespace changes
Inline Side-by-side
Showing with 234 additions and 82 deletions
extras/package/macosx/Resources/English.lproj/Preferences.xib
View file @ 2426d13b
...@@ -12,9 +12,8 @@ ...@@ -12,9 +12,8 @@
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="3746"/>
<integer value="2563"/>
<integer value="2311"/> <integer value="2311"/>
<integer value="2585"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -3967,28 +3966,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -3967,28 +3966,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
<object class="NSButton" id="609575117">
<reference key="NSNextResponder" ref="602221378"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{14, 162}, {269, 18}}</string>
<reference key="NSSuperview" ref="602221378"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="110275509">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Hardware acceleration</string>
<reference key="NSSupport" ref="96267115"/>
<reference key="NSControlView" ref="609575117"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="606027538"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="914645742"> <object class="NSTextField" id="914645742">
<reference key="NSNextResponder" ref="602221378"/> <reference key="NSNextResponder" ref="602221378"/>
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
...@@ -4077,6 +4054,94 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -4077,6 +4054,94 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
<object class="NSTextField" id="579515050">
<reference key="NSNextResponder" ref="602221378"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{12, 166}, {246, 17}}</string>
<reference key="NSSuperview" ref="602221378"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="312818050">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">272629760</int>
<string key="NSContents">Hardware Acceleration</string>
<reference key="NSSupport" ref="96267115"/>
<reference key="NSControlView" ref="579515050"/>
<reference key="NSBackgroundColor" ref="535468639"/>
<reference key="NSTextColor" ref="499525791"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSPopUpButton" id="245155142">
<reference key="NSNextResponder" ref="602221378"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{316, 160}, {202, 26}}</string>
<reference key="NSSuperview" ref="602221378"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="171067646">
<int key="NSCellFlags">-2076180416</int>
<int key="NSCellFlags2">2048</int>
<reference key="NSSupport" ref="96267115"/>
<reference key="NSControlView" ref="245155142"/>
<int key="NSButtonFlags">109199360</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="104387842"/>
<string key="NSAlternateContents"/>
<object class="NSMutableString" key="NSKeyEquivalent">
<characters key="NS.bytes"/>
</object>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
<object class="NSMenuItem" key="NSMenuItem" id="1033933840">
<reference key="NSMenu" ref="1029729080"/>
<string key="NSTitle">Item1</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
<reference key="NSOnImage" ref="680507396"/>
<reference key="NSMixedImage" ref="133157385"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="171067646"/>
</object>
<bool key="NSMenuItemRespectAlignment">YES</bool>
<object class="NSMenu" key="NSMenu" id="1029729080">
<object class="NSMutableString" key="NSTitle">
<characters key="NS.bytes">OtherViews</characters>
</object>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1033933840"/>
<object class="NSMenuItem" id="162051300">
<reference key="NSMenu" ref="1029729080"/>
<string key="NSTitle">Item2</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="680507396"/>
<reference key="NSMixedImage" ref="133157385"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="171067646"/>
</object>
<object class="NSMenuItem" id="1041123091">
<reference key="NSMenu" ref="1029729080"/>
<string key="NSTitle">Item3</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="680507396"/>
<reference key="NSMixedImage" ref="133157385"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="171067646"/>
</object>
</object>
</object>
<int key="NSPreferredEdge">3</int>
<bool key="NSUsesItemFromMenu">YES</bool>
<bool key="NSAltersState">YES</bool>
<int key="NSArrowPosition">1</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</object> </object>
<string key="NSFrame">{{2, 2}, {532, 194}}</string> <string key="NSFrame">{{2, 2}, {532, 194}}</string>
<reference key="NSSuperview" ref="980937121"/> <reference key="NSSuperview" ref="980937121"/>
...@@ -4631,7 +4696,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -4631,7 +4696,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<nil key="NSUserInterfaceItemIdentifier"/> <nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<object class="NSView" key="NSWindowView" id="613777167"> <object class="NSView" key="NSWindowView" id="613777167">
<reference key="NSNextResponder"/> <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews"> <object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -5429,7 +5494,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -5429,7 +5494,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
</object> </object>
<string key="NSFrameSize">{485, 254}</string> <string key="NSFrameSize">{485, 254}</string>
<reference key="NSSuperview"/>
<string key="NSReuseIdentifierKey">_NS:122</string> <string key="NSReuseIdentifierKey">_NS:122</string>
</object> </object>
<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string> <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
...@@ -7328,22 +7392,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -7328,22 +7392,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
<int key="connectionID">3731</int> <int key="connectionID">3731</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">inputSettingChanged:</string>
<reference key="source" ref="150917409"/>
<reference key="destination" ref="609575117"/>
</object>
<int key="connectionID">3736</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_input_avcodec_hw_ckb</string>
<reference key="source" ref="150917409"/>
<reference key="destination" ref="609575117"/>
</object>
<int key="connectionID">3737</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">interfaceSettingChanged:</string> <string key="label">interfaceSettingChanged:</string>
...@@ -7496,6 +7544,30 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -7496,6 +7544,30 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
<int key="connectionID">3860</int> <int key="connectionID">3860</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">inputSettingChanged:</string>
<reference key="source" ref="150917409"/>
<reference key="destination" ref="245155142"/>
</object>
<int key="connectionID">3869</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_input_avcodec_hw_pop</string>
<reference key="source" ref="150917409"/>
<reference key="destination" ref="245155142"/>
</object>
<int key="connectionID">3870</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_input_avcodec_hw_txt</string>
<reference key="source" ref="150917409"/>
<reference key="destination" ref="579515050"/>
</object>
<int key="connectionID">3871</int>
</object>
</object> </object>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects"> <object class="NSArray" key="orderedObjects">
...@@ -7939,7 +8011,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -7939,7 +8011,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="914645742"/> <reference ref="914645742"/>
<reference ref="133030296"/> <reference ref="133030296"/>
<reference ref="424292142"/> <reference ref="424292142"/>
<reference ref="609575117"/> <reference ref="579515050"/>
<reference ref="245155142"/>
</object> </object>
<reference key="parent" ref="127370005"/> <reference key="parent" ref="127370005"/>
</object> </object>
...@@ -10050,20 +10123,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -10050,20 +10123,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="366089510"/> <reference key="object" ref="366089510"/>
<reference key="parent" ref="928818136"/> <reference key="parent" ref="928818136"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">3733</int>
<reference key="object" ref="609575117"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="110275509"/>
</object>
<reference key="parent" ref="980937121"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3734</int>
<reference key="object" ref="110275509"/>
<reference key="parent" ref="609575117"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">3738</int> <int key="objectID">3738</int>
<reference key="object" ref="991426321"/> <reference key="object" ref="991426321"/>
...@@ -10650,6 +10709,64 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -10650,6 +10709,64 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="573965494"/> <reference key="object" ref="573965494"/>
<reference key="parent" ref="72912890"/> <reference key="parent" ref="72912890"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">3861</int>
<reference key="object" ref="579515050"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="312818050"/>
</object>
<reference key="parent" ref="980937121"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3862</int>
<reference key="object" ref="245155142"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="171067646"/>
</object>
<reference key="parent" ref="980937121"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3863</int>
<reference key="object" ref="171067646"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1029729080"/>
</object>
<reference key="parent" ref="245155142"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3864</int>
<reference key="object" ref="1029729080"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1033933840"/>
<reference ref="162051300"/>
<reference ref="1041123091"/>
</object>
<reference key="parent" ref="171067646"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3865</int>
<reference key="object" ref="1033933840"/>
<reference key="parent" ref="1029729080"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3866</int>
<reference key="object" ref="162051300"/>
<reference key="parent" ref="1029729080"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3867</int>
<reference key="object" ref="1041123091"/>
<reference key="parent" ref="1029729080"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3868</int>
<reference key="object" ref="312818050"/>
<reference key="parent" ref="579515050"/>
</object>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="flattenedProperties"> <object class="NSMutableDictionary" key="flattenedProperties">
...@@ -10967,8 +11084,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -10967,8 +11084,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>2592.IBPluginDependency</string> <string>2592.IBPluginDependency</string>
<string>2592.ImportedFromIB2</string> <string>2592.ImportedFromIB2</string>
<string>2593.IBPluginDependency</string> <string>2593.IBPluginDependency</string>
<string>2593.IBViewBoundsToFrameTransform</string>
<string>2593.ImportedFromIB2</string> <string>2593.ImportedFromIB2</string>
<string>2594.IBPluginDependency</string> <string>2594.IBPluginDependency</string>
<string>2594.IBViewBoundsToFrameTransform</string>
<string>2594.ImportedFromIB2</string> <string>2594.ImportedFromIB2</string>
<string>2595.IBPluginDependency</string> <string>2595.IBPluginDependency</string>
<string>2595.ImportedFromIB2</string> <string>2595.ImportedFromIB2</string>
...@@ -11282,10 +11401,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -11282,10 +11401,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>3732.IBNumberFormatterBehaviorMetadataKey</string> <string>3732.IBNumberFormatterBehaviorMetadataKey</string>
<string>3732.IBNumberFormatterLocalizesFormatMetadataKey</string> <string>3732.IBNumberFormatterLocalizesFormatMetadataKey</string>
<string>3732.IBPluginDependency</string> <string>3732.IBPluginDependency</string>
<string>3733.IBPluginDependency</string>
<string>3733.IBViewBoundsToFrameTransform</string>
<string>3733.ImportedFromIB2</string>
<string>3734.IBPluginDependency</string>
<string>3738.IBPluginDependency</string> <string>3738.IBPluginDependency</string>
<string>3738.IBViewBoundsToFrameTransform</string> <string>3738.IBViewBoundsToFrameTransform</string>
<string>3738.ImportedFromIB2</string> <string>3738.ImportedFromIB2</string>
...@@ -11391,6 +11506,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -11391,6 +11506,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>3850.IBPluginDependency</string> <string>3850.IBPluginDependency</string>
<string>3851.IBPluginDependency</string> <string>3851.IBPluginDependency</string>
<string>3852.IBPluginDependency</string> <string>3852.IBPluginDependency</string>
<string>3861.IBPluginDependency</string>
<string>3861.IBViewBoundsToFrameTransform</string>
<string>3861.ImportedFromIB2</string>
<string>3862.IBPluginDependency</string>
<string>3862.IBViewBoundsToFrameTransform</string>
<string>3862.ImportedFromIB2</string>
<string>3863.IBPluginDependency</string>
<string>3864.IBPluginDependency</string>
<string>3864.ImportedFromIB2</string>
<string>3865.IBPluginDependency</string>
<string>3865.ImportedFromIB2</string>
<string>3866.IBPluginDependency</string>
<string>3866.ImportedFromIB2</string>
<string>3867.IBPluginDependency</string>
<string>3867.ImportedFromIB2</string>
<string>3868.IBPluginDependency</string>
</object> </object>
<object class="NSMutableArray" key="dict.values"> <object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -11777,8 +11908,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -11777,8 +11908,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwugAAA</bytes>
</object>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDnoAAwu4AAA</bytes>
</object>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
...@@ -12155,12 +12292,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -12155,12 +12292,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwiwAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform"> <object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBuAAAw5AAAA</bytes> <bytes key="NSTransformStruct">P4AAAL+AAABBuAAAw5AAAA</bytes>
</object> </object>
...@@ -12309,6 +12440,26 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -12309,6 +12440,26 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwugAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDnoAAwu4AAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="unlocalizedProperties"> <object class="NSMutableDictionary" key="unlocalizedProperties">
...@@ -12327,7 +12478,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -12327,7 +12478,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">3860</int> <int key="maxID">3871</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="NSMutableArray" key="referencedPartialClassDescriptions">
...@@ -13678,7 +13829,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -13678,7 +13829,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>o_hotkeys_lbl</string> <string>o_hotkeys_lbl</string>
<string>o_hotkeys_listbox</string> <string>o_hotkeys_listbox</string>
<string>o_hotkeys_view</string> <string>o_hotkeys_view</string>
<string>o_input_avcodec_hw_ckb</string> <string>o_input_avcodec_hw_pop</string>
<string>o_input_avcodec_hw_txt</string>
<string>o_input_avi_pop</string> <string>o_input_avi_pop</string>
<string>o_input_avi_txt</string> <string>o_input_avi_txt</string>
<string>o_input_cachelevel_custom_txt</string> <string>o_input_cachelevel_custom_txt</string>
...@@ -13937,6 +14089,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -13937,6 +14089,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName"> <object class="NSMutableDictionary" key="toOneOutletInfosByName">
...@@ -13977,7 +14130,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -13977,7 +14130,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>o_hotkeys_lbl</string> <string>o_hotkeys_lbl</string>
<string>o_hotkeys_listbox</string> <string>o_hotkeys_listbox</string>
<string>o_hotkeys_view</string> <string>o_hotkeys_view</string>
<string>o_input_avcodec_hw_ckb</string> <string>o_input_avcodec_hw_pop</string>
<string>o_input_avcodec_hw_txt</string>
<string>o_input_avi_pop</string> <string>o_input_avi_pop</string>
<string>o_input_avi_txt</string> <string>o_input_avi_txt</string>
<string>o_input_cachelevel_custom_txt</string> <string>o_input_cachelevel_custom_txt</string>
...@@ -14228,7 +14382,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -14228,7 +14382,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
<string key="name">o_input_avcodec_hw_ckb</string> <string key="name">o_input_avcodec_hw_pop</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_input_avcodec_hw_txt</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
......
modules/gui/macosx/simple_prefs.h
View file @ 2426d13b
...@@ -77,7 +77,8 @@ ...@@ -77,7 +77,8 @@
IBOutlet id o_input_httpproxypwd_txt; IBOutlet id o_input_httpproxypwd_txt;
IBOutlet id o_input_mux_box; IBOutlet id o_input_mux_box;
IBOutlet id o_input_net_box; IBOutlet id o_input_net_box;
IBOutlet id o_input_avcodec_hw_ckb; IBOutlet id o_input_avcodec_hw_txt;
IBOutlet id o_input_avcodec_hw_pop;
IBOutlet id o_input_postproc_fld; IBOutlet id o_input_postproc_fld;
IBOutlet id o_input_postproc_txt; IBOutlet id o_input_postproc_txt;
IBOutlet id o_input_rtsp_ckb; IBOutlet id o_input_rtsp_ckb;
......
modules/gui/macosx/simple_prefs.m
View file @ 2426d13b
...@@ -209,7 +209,7 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc ...@@ -209,7 +209,7 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
[o_input_httpproxypwd_txt setStringValue: _NS("Password for HTTP Proxy")]; [o_input_httpproxypwd_txt setStringValue: _NS("Password for HTTP Proxy")];
[o_input_mux_box setTitle: _NS("Codecs / Muxers")]; [o_input_mux_box setTitle: _NS("Codecs / Muxers")];
[o_input_net_box setTitle: _NS("Network")]; [o_input_net_box setTitle: _NS("Network")];
[o_input_avcodec_hw_ckb setTitle: _NS("Hardware Acceleration")]; [o_input_avcodec_hw_txt setStringValue: _NS("Hardware Acceleration")];
[o_input_postproc_txt setStringValue: _NS("Post-Processing Quality")]; [o_input_postproc_txt setStringValue: _NS("Post-Processing Quality")];
[o_input_rtsp_ckb setTitle: _NS("Use RTP over RTSP (TCP)")]; [o_input_rtsp_ckb setTitle: _NS("Use RTP over RTSP (TCP)")];
[o_input_skipLoop_txt setStringValue: _NS("Skip the loop filter for H.264 decoding")]; [o_input_skipLoop_txt setStringValue: _NS("Skip the loop filter for H.264 decoding")];
...@@ -552,11 +552,7 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam ...@@ -552,11 +552,7 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
[self setupField: o_input_httpproxypwd_sfld forOption:"http-proxy-pwd"]; [self setupField: o_input_httpproxypwd_sfld forOption:"http-proxy-pwd"];
[o_input_postproc_fld setIntValue: config_GetInt(p_intf, "postproc-q")]; [o_input_postproc_fld setIntValue: config_GetInt(p_intf, "postproc-q")];
[o_input_postproc_fld setToolTip: _NS(config_GetLabel(p_intf, "postproc-q"))]; [o_input_postproc_fld setToolTip: _NS(config_GetLabel(p_intf, "postproc-q"))];
if (config_GetPsz(p_intf,"avcodec-hw")) [self setupButton: o_input_avcodec_hw_pop forModuleList: "avcodec-hw"];
[o_input_avcodec_hw_ckb setState: !strcmp(config_GetPsz(p_intf,"avcodec-hw"), "vdadecoder")];
else
[o_input_avcodec_hw_ckb setState: NSOffState];
[o_input_avcodec_hw_ckb setToolTip: _NS(config_GetLabel(p_intf,"avcodec-hw") ?: "")];
[self setupButton: o_input_avi_pop forIntList: "avi-index"]; [self setupButton: o_input_avi_pop forIntList: "avi-index"];
...@@ -893,10 +889,7 @@ static inline void save_module_list(intf_thread_t * p_intf, id object, const cha ...@@ -893,10 +889,7 @@ static inline void save_module_list(intf_thread_t * p_intf, id object, const cha
SaveIntList(o_input_avi_pop, "avi-index"); SaveIntList(o_input_avi_pop, "avi-index");
config_PutInt(p_intf, "rtsp-tcp", [o_input_rtsp_ckb state]); config_PutInt(p_intf, "rtsp-tcp", [o_input_rtsp_ckb state]);
if ([o_input_avcodec_hw_ckb state]) SaveModuleList(o_input_avcodec_hw_pop, "avcodec-hw");
config_PutPsz(p_intf, "avcodec-hw", "vdadecoder");
else
config_PutPsz(p_intf, "avcodec-hw", "");
SaveIntList(o_input_skipLoop_pop, "avcodec-skiploopfilter"); SaveIntList(o_input_skipLoop_pop, "avcodec-skiploopfilter");
config_PutInt(p_intf, "mkv-preload-local-dir", [o_input_mkv_preload_dir_ckb state]); config_PutInt(p_intf, "mkv-preload-local-dir", [o_input_mkv_preload_dir_ckb state]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment