Skip to content

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

macosx: CAS: implemented profile loading mechanism

parent 76c72672
Hide whitespace changes
Inline Side-by-side
Showing with 362 additions and 92 deletions
extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib
View file @ 8beb0c93
......@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.SystemVersion">11G15</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
......@@ -12,8 +12,8 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="10"/>
<integer value="132"/>
<integer value="10"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -635,6 +635,7 @@
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<object class="NSView" key="NSWindowView" id="258594766">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
......@@ -1046,7 +1047,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTabViewItem" id="150347254">
<string key="NSIdentifier">2</string>
<object class="NSView" key="NSView" id="293072252">
<reference key="NSNextResponder" ref="766667681"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -1317,7 +1318,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="493365581">
<reference key="NSNextResponder" ref="760924829"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{73, 95}, {96, 19}}</string>
<string key="NSFrame">{{73, 94}, {96, 19}}</string>
<reference key="NSSuperview" ref="760924829"/>
<string key="NSReuseIdentifierKey">_NS:817</string>
<bool key="NSEnabled">YES</bool>
......@@ -1336,7 +1337,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="294405134">
<reference key="NSNextResponder" ref="760924829"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{220, 96}, {53, 14}}</string>
<string key="NSFrame">{{220, 95}, {53, 14}}</string>
<reference key="NSSuperview" ref="760924829"/>
<string key="NSReuseIdentifierKey">_NS:4068</string>
<bool key="NSEnabled">YES</bool>
......@@ -1351,29 +1352,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSTextColor" ref="253057760"/>
</object>
</object>
<object class="NSTextField" id="425950140">
<reference key="NSNextResponder" ref="760924829"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{278, 94}, {96, 19}}</string>
<reference key="NSSuperview" ref="760924829"/>
<string key="NSReuseIdentifierKey">_NS:817</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="303600427">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags2">272761856</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="26"/>
<string key="NSCellIdentifier">_NS:817</string>
<reference key="NSControlView" ref="425950140"/>
<bool key="NSDrawsBackground">YES</bool>
<reference key="NSBackgroundColor" ref="1042535097"/>
<reference key="NSTextColor" ref="361839307"/>
</object>
</object>
<object class="NSTextField" id="210733286">
<reference key="NSNextResponder" ref="760924829"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{73, 70}, {96, 19}}</string>
<string key="NSFrame">{{73, 69}, {96, 19}}</string>
<reference key="NSSuperview" ref="760924829"/>
<string key="NSReuseIdentifierKey">_NS:817</string>
<bool key="NSEnabled">YES</bool>
......@@ -1392,7 +1374,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="552998901">
<reference key="NSNextResponder" ref="760924829"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 97}, {53, 14}}</string>
<string key="NSFrame">{{15, 96}, {53, 14}}</string>
<reference key="NSSuperview" ref="760924829"/>
<string key="NSReuseIdentifierKey">_NS:4068</string>
<bool key="NSEnabled">YES</bool>
......@@ -1410,7 +1392,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="999606719">
<reference key="NSNextResponder" ref="760924829"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 72}, {53, 14}}</string>
<string key="NSFrame">{{15, 71}, {53, 14}}</string>
<reference key="NSSuperview" ref="760924829"/>
<string key="NSReuseIdentifierKey">_NS:4068</string>
<bool key="NSEnabled">YES</bool>
......@@ -1428,7 +1410,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="646879153">
<reference key="NSNextResponder" ref="760924829"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 20}, {362, 42}}</string>
<string key="NSFrame">{{15, 19}, {362, 42}}</string>
<reference key="NSSuperview" ref="760924829"/>
<string key="NSReuseIdentifierKey">_NS:3939</string>
<bool key="NSEnabled">YES</bool>
......@@ -1443,8 +1425,76 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSTextColor" ref="253057760"/>
</object>
</object>
<object class="NSPopUpButton" id="378256048">
<reference key="NSNextResponder" ref="760924829"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{275, 90}, {102, 22}}</string>
<reference key="NSSuperview" ref="760924829"/>
<string key="NSReuseIdentifierKey">_NS:791</string>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="251638218">
<int key="NSCellFlags">-2076049856</int>
<int key="NSCellFlags2">133120</int>
<reference key="NSSupport" ref="26"/>
<string key="NSCellIdentifier">_NS:791</string>
<reference key="NSControlView" ref="378256048"/>
<int key="NSButtonFlags">109199615</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
<object class="NSMenuItem" key="NSMenuItem" id="413590310">
<reference key="NSMenu" ref="874510397"/>
<string key="NSTitle">Item 1</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
<reference key="NSOnImage" ref="563075849"/>
<reference key="NSMixedImage" ref="163073959"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="251638218"/>
</object>
<bool key="NSMenuItemRespectAlignment">YES</bool>
<object class="NSMenu" key="NSMenu" id="874510397">
<string key="NSTitle">OtherViews</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="413590310"/>
<object class="NSMenuItem" id="299853618">
<reference key="NSMenu" ref="874510397"/>
<string key="NSTitle">Item 2</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="563075849"/>
<reference key="NSMixedImage" ref="163073959"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="251638218"/>
</object>
<object class="NSMenuItem" id="992521422">
<reference key="NSMenu" ref="874510397"/>
<string key="NSTitle">Item 3</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="563075849"/>
<reference key="NSMixedImage" ref="163073959"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="251638218"/>
</object>
</object>
<reference key="NSMenuFont" ref="1024428774"/>
</object>
<int key="NSPreferredEdge">1</int>
<bool key="NSUsesItemFromMenu">YES</bool>
<bool key="NSAltersState">YES</bool>
<int key="NSArrowPosition">2</int>
</object>
</object>
</object>
<string key="NSFrame">{{1, 0.96875}, {392, 123}}</string>
<string key="NSFrame">{{1, 1.453125}, {392, 122}}</string>
<reference key="NSSuperview" ref="356820111"/>
<string key="NSReuseIdentifierKey">_NS:21</string>
</object>
......@@ -1472,7 +1522,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<string key="NSFrame">{{10, 33}, {512, 277}}</string>
<reference key="NSSuperview" ref="766667681"/>
<string key="NSReuseIdentifierKey">_NS:571</string>
</object>
<string key="NSLabel">Video codec</string>
......@@ -1482,7 +1531,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTabViewItem" id="214859657">
<string key="NSIdentifier">Item 2</string>
<object class="NSView" key="NSView" id="136070917">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder" ref="766667681"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -1818,6 +1867,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<string key="NSFrame">{{10, 33}, {512, 277}}</string>
<reference key="NSSuperview" ref="766667681"/>
</object>
<string key="NSLabel">Audio codec</string>
<reference key="NSColor" ref="382902660"/>
......@@ -1954,14 +2004,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSTabView" ref="766667681"/>
</object>
</object>
<reference key="NSSelectedTabViewItem" ref="150347254"/>
<reference key="NSSelectedTabViewItem" ref="214859657"/>
<reference key="NSFont" ref="1024428774"/>
<int key="NSTvFlags">0</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="293072252"/>
<reference ref="136070917"/>
</object>
</object>
<object class="NSButton" id="876884721">
......@@ -2445,14 +2495,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">279</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_customize_vid_scale_fld</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="425950140"/>
</object>
<int key="connectionID">280</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_customize_vid_scale_lbl</string>
......@@ -2501,6 +2543,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">286</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_customize_vid_scale_pop</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="378256048"/>
</object>
<int key="connectionID">293</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
......@@ -3287,11 +3337,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="493365581"/>
<reference ref="294405134"/>
<reference ref="425950140"/>
<reference ref="210733286"/>
<reference ref="552998901"/>
<reference ref="999606719"/>
<reference ref="646879153"/>
<reference ref="378256048"/>
</object>
<reference key="parent" ref="293072252"/>
</object>
......@@ -3323,20 +3373,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="941441891"/>
<reference key="parent" ref="294405134"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">203</int>
<reference key="object" ref="425950140"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="303600427"/>
</object>
<reference key="parent" ref="356820111"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">204</int>
<reference key="object" ref="303600427"/>
<reference key="parent" ref="425950140"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">199</int>
<reference key="object" ref="210733286"/>
......@@ -3693,6 +3729,50 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="277861297"/>
<reference key="parent" ref="172789852"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">287</int>
<reference key="object" ref="378256048"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="251638218"/>
</object>
<reference key="parent" ref="356820111"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">288</int>
<reference key="object" ref="251638218"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="874510397"/>
</object>
<reference key="parent" ref="378256048"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">289</int>
<reference key="object" ref="874510397"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="413590310"/>
<reference ref="299853618"/>
<reference ref="992521422"/>
</object>
<reference key="parent" ref="251638218"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">290</int>
<reference key="object" ref="413590310"/>
<reference key="parent" ref="874510397"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">291</int>
<reference key="object" ref="299853618"/>
<reference key="parent" ref="874510397"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">292</int>
<reference key="object" ref="992521422"/>
<reference key="parent" ref="874510397"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
......@@ -3801,9 +3881,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>201.IBPluginDependency</string>
<string>202.IBPluginDependency</string>
<string>202.IBViewBoundsToFrameTransform</string>
<string>203.IBPluginDependency</string>
<string>203.IBViewBoundsToFrameTransform</string>
<string>204.IBPluginDependency</string>
<string>205.IBPluginDependency</string>
<string>206.IBViewBoundsToFrameTransform</string>
<string>207.IBPluginDependency</string>
......@@ -3877,7 +3954,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>27.IBPluginDependency</string>
<string>27.IBViewBoundsToFrameTransform</string>
<string>28.IBPluginDependency</string>
<string>287.IBPluginDependency</string>
<string>287.IBViewBoundsToFrameTransform</string>
<string>288.IBPluginDependency</string>
<string>289.IBPluginDependency</string>
<string>29.IBPluginDependency</string>
<string>290.IBPluginDependency</string>
<string>291.IBPluginDependency</string>
<string>292.IBPluginDependency</string>
<string>3.CustomClassName</string>
<string>3.IBPluginDependency</string>
<string>3.IBViewBoundsToFrameTransform</string>
......@@ -3916,9 +4000,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{669, 523}, {663, 490}}</string>
<string>{{617, 266}, {663, 490}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{669, 523}, {663, 490}}</string>
<string>{{617, 266}, {663, 490}}</string>
<boolean value="NO"/>
<string>{196, 240}</string>
<string>{{357, 418}, {480, 270}}</string>
......@@ -3939,9 +4023,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDUQAAwmgAAA</bytes>
</object>
<string>{{1244, 814}, {558, 370}}</string>
<string>{{292, 96}, {558, 370}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{1244, 814}, {558, 370}}</string>
<string>{{292, 96}, {558, 370}}</string>
<boolean value="NO"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -4064,11 +4148,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDdwAAwowAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDmIAAwpIAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUJsAABBcAAAA</bytes>
</object>
......@@ -4182,6 +4261,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDgIAAwuAAAA</bytes>
</object>
<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>VLCDropEnabledBox</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
......@@ -4252,7 +4340,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">286</int>
<int key="maxID">293</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
......@@ -4355,8 +4443,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>_customize_vid_keep_ckb</string>
<string>_customize_vid_res_box</string>
<string>_customize_vid_res_lbl</string>
<string>_customize_vid_scale_fld</string>
<string>_customize_vid_scale_lbl</string>
<string>_customize_vid_scale_pop</string>
<string>_customize_vid_width_fld</string>
<string>_customize_vid_width_lbl</string>
<string>_destination_btn</string>
......@@ -4468,8 +4556,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>_customize_vid_keep_ckb</string>
<string>_customize_vid_res_box</string>
<string>_customize_vid_res_lbl</string>
<string>_customize_vid_scale_fld</string>
<string>_customize_vid_scale_lbl</string>
<string>_customize_vid_scale_pop</string>
<string>_customize_vid_width_fld</string>
<string>_customize_vid_width_lbl</string>
<string>_destination_btn</string>
......@@ -4617,11 +4705,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">_customize_vid_scale_fld</string>
<string key="name">_customize_vid_scale_lbl</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">_customize_vid_scale_lbl</string>
<string key="name">_customize_vid_scale_pop</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
......
modules/gui/macosx/ConvertAndSave.h
View file @ 8beb0c93
......@@ -68,7 +68,7 @@
IBOutlet id _customize_vid_height_lbl;
IBOutlet id _customize_vid_height_fld;
IBOutlet id _customize_vid_scale_lbl;
IBOutlet id _customize_vid_scale_fld;
IBOutlet id _customize_vid_scale_pop;
IBOutlet id _customize_aud_ckb;
IBOutlet id _customize_aud_keep_ckb;
IBOutlet id _customize_aud_codec_lbl;
......@@ -87,6 +87,9 @@
NSString * _outputDestination;
NSArray * _profileNames;
NSArray * _profileValueList;
NSArray * _videoCodecs;
NSArray * _audioCodecs;
NSArray * _subsCodecs;
NSMutableArray * _currentProfile;
}
@property (readwrite, nonatomic, retain) NSString * MRL;
......
modules/gui/macosx/ConvertAndSave.m
View file @ 8beb0c93
......@@ -26,12 +26,32 @@
#import <vlc_common.h>
#import <vlc_url.h>
/* mini doc:
* the used NSMatrix includes a bunch of cells referenced most easily by tags. There you go: */
#define MPEGTS 0
#define WEBM 1
#define OGG 2
#define MP4 3
#define MPEGPS 4
#define MJPEG 5
#define WAV 6
#define FLV 7
#define MPEG1 8
#define MKV 9
#define RAW 10
#define AVI 11
#define ASF 12
/* 13-15 are present, but not set */
@implementation VLCConvertAndSave
@synthesize MRL=_MRL, outputDestination=_outputDestination, profileNames=_profileNames, profileValueList=_profileValueList, currentProfile=_currentProfile;
static VLCConvertAndSave *_o_sharedInstance = nil;
#pragma mark -
#pragma mark Initialization
+ (VLCConvertAndSave *)sharedInstance
{
return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
......@@ -54,13 +74,15 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[_MRL release];
if (_outputDestination)
[_outputDestination release];
if (_profileNames)
[_profileNames release];
if (_profileValueList)
[_profileValueList release];
if (_currentProfile)
[_currentProfile release];
[_profileNames release];
[_profileValueList release];
[_videoCodecs release];
[_audioCodecs release];
[_subsCodecs release];
[super dealloc];
}
......@@ -124,7 +146,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
@"Audio - MP3 (MP4)",
@"Audio - FLAC",
@"Audio - CD",
_NS("Custom"),
// _NS("Custom"),
nil];
/* We are using the same format as the Qt4 intf here:
......@@ -151,13 +173,57 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[_profile_pop removeAllItems];
[_profile_pop addItemsWithTitles: _profileNames];
_videoCodecs = [[NSArray alloc] initWithObjects:
[NSArray arrayWithObjects:@"MPEG-1", @"MPEG-2", @"MPEG-4", @"DIVX 1", @"DIVX 2", @"DIVX 3", @"H.263", @"H.264", @"VP8", @"WMV1", @"WMV2", @"M-JPEG", @"Theora", @"Dirac", nil],
[NSArray arrayWithObjects:@"mpgv", @"mp2v", @"mp4v", @"DIV1", @"DIV2", @"DIV3", @"H263", @"h264", @"VP80", @"WMV1", @"WMV2", @"MJPG", @"theo", @"drac", nil],
nil];
_audioCodecs = [[NSArray alloc] initWithObjects:
[NSArray arrayWithObjects:@"MPEG Audio", @"MP3", @"MPEG 4 Audio (AAC)", @"A52/AC-3", @"Vorbis", @"Flac", @"Speex", @"WAV", @"WMA2", nil],
[NSArray arrayWithObjects:@"mpga", @"mp3", @"mp4a", @"a52", @"vorb", @"flac", @"spx", @"s16l", @"wma2", nil],
nil];
_subsCodecs = [[NSArray alloc] initWithObjects:
[NSArray arrayWithObjects:@"DVB subtitle", @"T.140", nil],
[NSArray arrayWithObjects:@"dvbs", @"t140", nil],
nil];
[_customize_vid_codec_pop removeAllItems];
[_customize_vid_scale_pop removeAllItems];
[_customize_aud_codec_pop removeAllItems];
[_customize_aud_samplerate_pop removeAllItems];
[_customize_subs_pop removeAllItems];
[_customize_vid_codec_pop addItemsWithTitles:[_videoCodecs objectAtIndex:0]];
[_customize_aud_codec_pop addItemsWithTitles:[_audioCodecs objectAtIndex:0]];
[_customize_subs_pop addItemsWithTitles:[_subsCodecs objectAtIndex:0]];
[_customize_aud_samplerate_pop addItemWithTitle:@"8000"];
[_customize_aud_samplerate_pop addItemWithTitle:@"11025"];
[_customize_aud_samplerate_pop addItemWithTitle:@"22050"];
[_customize_aud_samplerate_pop addItemWithTitle:@"44100"];
[_customize_aud_samplerate_pop addItemWithTitle:@"48000"];
[_customize_vid_scale_pop addItemWithTitle:@"1"];
[_customize_vid_scale_pop addItemWithTitle:@"0.25"];
[_customize_vid_scale_pop addItemWithTitle:@"0.5"];
[_customize_vid_scale_pop addItemWithTitle:@"0.75"];
[_customize_vid_scale_pop addItemWithTitle:@"1.25"];
[_customize_vid_scale_pop addItemWithTitle:@"1.5"];
[_customize_vid_scale_pop addItemWithTitle:@"1.75"];
[_customize_vid_scale_pop addItemWithTitle:@"2"];
}
# pragma mark -
# pragma mark Code to Communicate with other objects
- (void)toggleWindow
{
[_window makeKeyAndOrderFront: nil];
}
# pragma mark -
# pragma mark User Interaction
- (IBAction)windowButtonAction:(id)sender
{
}
......@@ -179,6 +245,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
- (IBAction)customizeProfile:(id)sender
{
[self resetCustomizationSheetBasedOnProfile:[_profile_pop indexOfSelectedItem]];
[NSApp beginSheet:_customize_panel modalForWindow:_window modalDelegate:self didEndSelector:NULL contextInfo:nil];
}
......@@ -211,6 +278,29 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
}
}
- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
{
NSPasteboard *paste = [sender draggingPasteboard];
NSArray *types = [NSArray arrayWithObject: NSFilenamesPboardType];
NSString *desired_type = [paste availableTypeFromArray: types];
NSData *carried_data = [paste dataForType: desired_type];
if( carried_data ) {
if( [desired_type isEqualToString:NSFilenamesPboardType] ) {
NSArray *values = [[paste propertyListForType: NSFilenamesPboardType] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
if ([values count] > 0) {
[self setMRL: [NSString stringWithUTF8String:make_URI([[values objectAtIndex:0] UTF8String], NULL)]];
[self updateDropView];
return YES;
}
}
}
return NO;
}
# pragma mark -
# pragma mark Private Functionality
- (void)updateDropView
{
if ([_MRL length] > 0) {
......@@ -235,25 +325,114 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
}
}
- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
- (void)resetCustomizationSheetBasedOnProfile:(NSInteger)profileNumber
{
NSPasteboard *paste = [sender draggingPasteboard];
NSArray *types = [NSArray arrayWithObject: NSFilenamesPboardType];
NSString *desired_type = [paste availableTypeFromArray: types];
NSData *carried_data = [paste dataForType: desired_type];
/* Container(string), transcode video(bool), transcode audio(bool),
* use subtitles(bool), video codec(string), video bitrate(integer),
* scale(float), fps(float), width(integer, height(integer),
* audio codec(string), audio bitrate(integer), channels(integer),
* samplerate(integer), subtitle codec(string), subtitle overlay(bool) */
NSArray * components = [[_profileValueList objectAtIndex:profileNumber] componentsSeparatedByString:@";"];
if ([components count] != 16) {
msg_Err(VLCIntf, "CAS: the requested profile %li is invalid", profileNumber);
return;
}
if( carried_data ) {
if( [desired_type isEqualToString:NSFilenamesPboardType] ) {
NSArray *values = [[paste propertyListForType: NSFilenamesPboardType] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
[self selectCellByEncapsulationFormat:[components objectAtIndex:0]];
[_customize_vid_ckb setState:[[components objectAtIndex:1] intValue]];
[_customize_aud_ckb setState:[[components objectAtIndex:2] intValue]];
[_customize_subs_ckb setState:[[components objectAtIndex:3] intValue]];
[_customize_vid_bitrate_fld setStringValue:[components objectAtIndex:5]];
[_customize_vid_scale_pop selectItemWithTitle:[components objectAtIndex:6]];
[_customize_vid_framerate_fld setStringValue:[components objectAtIndex:7]];
[_customize_vid_width_fld setStringValue:[components objectAtIndex:8]];
[_customize_vid_height_fld setStringValue:[components objectAtIndex:9]];
[_customize_aud_bitrate_fld setStringValue:[components objectAtIndex:11]];
[_customize_aud_channels_fld setStringValue:[components objectAtIndex:12]];
[_customize_aud_samplerate_pop selectItemWithTitle:[components objectAtIndex:13]];
[_customize_subs_overlay_ckb setState:[[components objectAtIndex:15] intValue]];
/* since there is no proper lookup mechanism in arrays, we need to implement a string specific one ourselves */
NSArray * tempArray = [_videoCodecs objectAtIndex:1];
NSUInteger count = [tempArray count];
NSString * searchString = [components objectAtIndex:4];
if ([searchString isEqualToString:@"none"] || [searchString isEqualToString:@"0"]) {
[_customize_vid_codec_pop selectItemAtIndex:-1];
} else {
for (NSUInteger x = 0; x < count; x++) {
if ([[tempArray objectAtIndex:x] isEqualToString: searchString]) {
[_customize_vid_codec_pop selectItemAtIndex:x];
break;
}
}
}
if ([values count] > 0) {
[self setMRL: [NSString stringWithUTF8String:make_URI([[values objectAtIndex:0] UTF8String], NULL)]];
[self updateDropView];
return YES;
tempArray = [_audioCodecs objectAtIndex:1];
count = [tempArray count];
searchString = [components objectAtIndex:10];
if ([searchString isEqualToString:@"none"] || [searchString isEqualToString:@"0"]) {
[_customize_aud_codec_pop selectItemAtIndex:-1];
} else {
for (NSUInteger x = 0; x < count; x++) {
if ([[tempArray objectAtIndex:x] isEqualToString: searchString]) {
[_customize_aud_codec_pop selectItemAtIndex:x];
break;
}
}
}
return NO;
tempArray = [_subsCodecs objectAtIndex:1];
count = [tempArray count];
searchString = [components objectAtIndex:14];
if ([searchString isEqualToString:@"none"] || [searchString isEqualToString:@"0"]) {
[_customize_subs_pop selectItemAtIndex:-1];
} else {
for (NSUInteger x = 0; x < count; x++) {
if ([[tempArray objectAtIndex:x] isEqualToString: searchString]) {
[_customize_subs_pop selectItemAtIndex:x];
break;
}
}
}
}
- (void)selectCellByEncapsulationFormat:(NSString *)format
{
if ([format isEqualToString:@"ts"])
[_customize_encap_matrix selectCellWithTag:MPEGTS];
else if([format isEqualToString:@"webm"])
[_customize_encap_matrix selectCellWithTag:WEBM];
else if([format isEqualToString:@"ogg"])
[_customize_encap_matrix selectCellWithTag:OGG];
else if([format isEqualToString:@"ogm"])
[_customize_encap_matrix selectCellWithTag:OGG];
else if([format isEqualToString:@"mp4"])
[_customize_encap_matrix selectCellWithTag:MP4];
else if([format isEqualToString:@"mov"])
[_customize_encap_matrix selectCellWithTag:MP4];
else if([format isEqualToString:@"ps"])
[_customize_encap_matrix selectCellWithTag:MPEGPS];
else if([format isEqualToString:@"mjpeg"])
[_customize_encap_matrix selectCellWithTag:MJPEG];
else if([format isEqualToString:@"wav"])
[_customize_encap_matrix selectCellWithTag:WAV];
else if([format isEqualToString:@"flv"])
[_customize_encap_matrix selectCellWithTag:FLV];
else if([format isEqualToString:@"mpg"])
[_customize_encap_matrix selectCellWithTag:MPEG1];
else if([format isEqualToString:@"mkv"])
[_customize_encap_matrix selectCellWithTag:MKV];
else if([format isEqualToString:@"raw"])
[_customize_encap_matrix selectCellWithTag:RAW];
else if([format isEqualToString:@"avi"])
[_customize_encap_matrix selectCellWithTag:AVI];
else if([format isEqualToString:@"asf"])
[_customize_encap_matrix selectCellWithTag:ASF];
else if([format isEqualToString:@"wmv"])
[_customize_encap_matrix selectCellWithTag:ASF];
else
msg_Err(VLCIntf, "CAS: unknown encap format requested for customization");
}
@end
......
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