Skip to content

V
vlc-gpu
Commit e9947e6f authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: re-implemented the slower/faster menu items as a logarithmic slider... 

macosx: re-implemented the slower/faster menu items as a logarithmic slider similar to the Qt interface
parent 95606ba8
Show whitespace changes
Inline Side-by-side
Showing with 583 additions and 155 deletions
extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
View file @ e9947e6f
......@@ -2,22 +2,23 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1040</int>
<string key="IBDocument.SystemVersion">11A494a</string>
<string key="IBDocument.SystemVersion">11A511</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1128</string>
<string key="IBDocument.HIToolboxVersion">564.00</string>
<string key="IBDocument.AppKitVersion">1138</string>
<string key="IBDocument.HIToolboxVersion">566.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">851</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="24"/>
<integer value="2730"/>
<integer value="2"/>
<integer value="915"/>
<integer value="283"/>
<integer value="235"/>
<integer value="2730"/>
<integer value="2417"/>
<integer value="915"/>
<integer value="4596"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -1406,32 +1407,14 @@
<reference key="NSOnImage" ref="447396056"/>
<reference key="NSMixedImage" ref="100133332"/>
</object>
<object class="NSMenuItem" id="646718271">
<reference key="NSMenu" ref="1017583928"/>
<string key="NSTitle">Faster</string>
<string key="NSKeyEquiv">=</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="447396056"/>
<reference key="NSMixedImage" ref="100133332"/>
</object>
<object class="NSMenuItem" id="351113197">
<object class="NSMenuItem" id="823365566">
<reference key="NSMenu" ref="1017583928"/>
<string key="NSTitle">Normal rate</string>
<string key="NSTitle">Rate (view)</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="447396056"/>
<reference key="NSMixedImage" ref="100133332"/>
</object>
<object class="NSMenuItem" id="677263432">
<reference key="NSMenu" ref="1017583928"/>
<string key="NSTitle">Slower</string>
<string key="NSKeyEquiv">-</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="447396056"/>
<reference key="NSMixedImage" ref="100133332"/>
</object>
<object class="NSMenuItem" id="268023751">
<reference key="NSMenu" ref="1017583928"/>
<bool key="NSIsDisabled">YES</bool>
......@@ -4185,6 +4168,170 @@ LCAuLi4</string>
<object class="NSCustomObject" id="1040926652">
<string key="NSClassName">SUUpdater</string>
</object>
<object class="NSCustomView" id="560875128">
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="103751139">
<reference key="NSNextResponder" ref="560875128"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{227, 35}, {62.796875, 18}}</string>
<reference key="NSSuperview" ref="560875128"/>
<string key="NSReuseIdentifierKey">_NS:4068</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="385075814">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">1x</string>
<object class="NSFont" key="NSSupport" id="481094678">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSCellIdentifier">_NS:4068</string>
<reference key="NSControlView" ref="103751139"/>
<reference key="NSBackgroundColor" ref="3414043"/>
<object class="NSColor" key="NSTextColor" id="140632782">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">windowFrameColor</string>
<reference key="NSColor" ref="563235091"/>
</object>
</object>
</object>
<object class="NSTextField" id="935681074">
<reference key="NSNextResponder" ref="560875128"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{19, 35}, {273, 18}}</string>
<reference key="NSSuperview" ref="560875128"/>
<string key="NSReuseIdentifierKey">_NS:4068</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="247978791">
<int key="NSCellFlags">605158976</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Playback Speed</string>
<reference key="NSSupport" ref="481094678"/>
<string key="NSCellIdentifier">_NS:4068</string>
<reference key="NSControlView" ref="935681074"/>
<reference key="NSBackgroundColor" ref="3414043"/>
<reference key="NSTextColor" ref="140632782"/>
</object>
</object>
<object class="NSTextField" id="177357217">
<reference key="NSNextResponder" ref="560875128"/>
<int key="NSvFlags">-2147483380</int>
<string key="NSFrame">{{19, 35}, {273, 18}}</string>
<reference key="NSSuperview" ref="560875128"/>
<string key="NSReuseIdentifierKey">_NS:4068</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="678671392">
<int key="NSCellFlags">605158976</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Playback Speed</string>
<reference key="NSSupport" ref="481094678"/>
<string key="NSCellIdentifier">_NS:4068</string>
<reference key="NSControlView" ref="177357217"/>
<reference key="NSBackgroundColor" ref="3414043"/>
<reference key="NSTextColor" ref="306532497"/>
</object>
</object>
<object class="NSBox" id="541882601">
<reference key="NSNextResponder" ref="560875128"/>
<int key="NSvFlags">12</int>
<string key="NSFrame">{{156, 11}, {5, 8}}</string>
<reference key="NSSuperview" ref="560875128"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="841513812"/>
<reference key="NSBackgroundColor" ref="166084101"/>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
</object>
</object>
<int key="NSBorderType">3</int>
<int key="NSBoxType">2</int>
<int key="NSTitlePosition">0</int>
<bool key="NSTransparent">NO</bool>
</object>
<object class="NSTextField" id="811878628">
<reference key="NSNextResponder" ref="560875128"/>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{101.76171875, 19}, {115.421875, 14}}</string>
<reference key="NSSuperview" ref="560875128"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="923605742">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">138544128</int>
<string key="NSContents">Normal</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="811878628"/>
<reference key="NSBackgroundColor" ref="3414043"/>
<reference key="NSTextColor" ref="140632782"/>
</object>
</object>
<object class="NSTextField" id="754695396">
<reference key="NSNextResponder" ref="560875128"/>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{210.90234375, 19}, {79.09765625, 14}}</string>
<reference key="NSSuperview" ref="560875128"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="908114002">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">71435264</int>
<string key="NSContents">Faster</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="754695396"/>
<reference key="NSBackgroundColor" ref="3414043"/>
<reference key="NSTextColor" ref="140632782"/>
</object>
</object>
<object class="NSTextField" id="421148087">
<reference key="NSNextResponder" ref="560875128"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{27, 19}, {76.96484375, 14}}</string>
<reference key="NSSuperview" ref="560875128"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="647762012">
<int key="NSCellFlags">605158976</int>
<int key="NSCellFlags2">272761856</int>
<string key="NSContents">Slower</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="421148087"/>
<reference key="NSBackgroundColor" ref="3414043"/>
<reference key="NSTextColor" ref="140632782"/>
</object>
</object>
<object class="NSSlider" id="844737467">
<reference key="NSNextResponder" ref="560875128"/>
<int key="NSvFlags">298</int>
<string key="NSFrame">{{28, 3}, {261, 16}}</string>
<reference key="NSSuperview" ref="560875128"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="819871674">
<int key="NSCellFlags">-1543110912</int>
<int key="NSCellFlags2">262144</int>
<string key="NSContents"/>
<reference key="NSControlView" ref="844737467"/>
<double key="NSMaxValue">34</double>
<double key="NSMinValue">-34</double>
<double key="NSValue">0.0</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">33</int>
<int key="NSTickMarkPosition">1</int>
<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
<bool key="NSVertical">NO</bool>
</object>
</object>
</object>
<string key="NSFrameSize">{307, 53}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
......@@ -4293,22 +4440,6 @@ LCAuLi4</string>
</object>
<int key="connectionID">273</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">faster:</string>
<reference key="source" ref="113811151"/>
<reference key="destination" ref="646718271"/>
</object>
<int key="connectionID">274</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">slower:</string>
<reference key="source" ref="113811151"/>
<reference key="destination" ref="677263432"/>
</object>
<int key="connectionID">275</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">prev:</string>
......@@ -5517,14 +5648,6 @@ LCAuLi4</string>
</object>
<int key="connectionID">4388</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">normalSpeed:</string>
<reference key="source" ref="113811151"/>
<reference key="destination" ref="351113197"/>
</object>
<int key="connectionID">4391</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">quitAfterPlayback:</string>
......@@ -5845,14 +5968,6 @@ LCAuLi4</string>
</object>
<int key="connectionID">4472</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_faster</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="646718271"/>
</object>
<int key="connectionID">4473</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_ffmpeg_pp</string>
......@@ -5989,14 +6104,6 @@ LCAuLi4</string>
</object>
<int key="connectionID">4490</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_normalSpeed</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="351113197"/>
</object>
<int key="connectionID">4491</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_normal_window</string>
......@@ -6189,14 +6296,6 @@ LCAuLi4</string>
</object>
<int key="connectionID">4517</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_slower</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="677263432"/>
</object>
<int key="connectionID">4518</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_snapshot</string>
......@@ -6805,6 +6904,86 @@ LCAuLi4</string>
</object>
<int key="connectionID">4595</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_rate_view</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="560875128"/>
</object>
<int key="connectionID">4606</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_rate</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="823365566"/>
</object>
<int key="connectionID">4610</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_rate_faster_lbl</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="754695396"/>
</object>
<int key="connectionID">4611</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_rate_normal_lbl</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="811878628"/>
</object>
<int key="connectionID">4612</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_rate_sld</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="844737467"/>
</object>
<int key="connectionID">4613</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_rate_slower_lbl</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="421148087"/>
</object>
<int key="connectionID">4614</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_rate_fld</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="103751139"/>
</object>
<int key="connectionID">4620</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">setPlaybackRate:</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="844737467"/>
</object>
<int key="connectionID">4621</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_rate_lbl</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="177357217"/>
</object>
<int key="connectionID">4624</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_rate_lbl_gray</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="935681074"/>
</object>
<int key="connectionID">4625</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
......@@ -7377,8 +7556,6 @@ LCAuLi4</string>
<reference ref="761711469"/>
<reference ref="1030156938"/>
<reference ref="99474489"/>
<reference ref="646718271"/>
<reference ref="677263432"/>
<reference ref="747416650"/>
<reference ref="100081367"/>
<reference ref="154223117"/>
......@@ -7391,10 +7568,10 @@ LCAuLi4</string>
<reference ref="710311552"/>
<reference ref="815382067"/>
<reference ref="252261385"/>
<reference ref="375871953"/>
<reference ref="351113197"/>
<reference ref="780676656"/>
<reference ref="938524312"/>
<reference ref="823365566"/>
<reference ref="375871953"/>
</object>
<reference key="parent" ref="565445175"/>
</object>
......@@ -7413,16 +7590,6 @@ LCAuLi4</string>
<reference key="object" ref="99474489"/>
<reference key="parent" ref="1017583928"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">241</int>
<reference key="object" ref="646718271"/>
<reference key="parent" ref="1017583928"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">242</int>
<reference key="object" ref="677263432"/>
<reference key="parent" ref="1017583928"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">243</int>
<reference key="object" ref="747416650"/>
......@@ -9046,11 +9213,6 @@ LCAuLi4</string>
<reference key="object" ref="1040926652"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4389</int>
<reference key="object" ref="351113197"/>
<reference key="parent" ref="1017583928"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4392</int>
<reference key="object" ref="780676656"/>
......@@ -9353,6 +9515,131 @@ LCAuLi4</string>
<reference key="object" ref="651263286"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4596</int>
<reference key="object" ref="560875128"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="844737467"/>
<reference ref="811878628"/>
<reference ref="754695396"/>
<reference ref="421148087"/>
<reference ref="541882601"/>
<reference ref="177357217"/>
<reference ref="103751139"/>
<reference ref="935681074"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">Rate Menu View</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">4597</int>
<reference key="object" ref="844737467"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="819871674"/>
</object>
<reference key="parent" ref="560875128"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4598</int>
<reference key="object" ref="811878628"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="923605742"/>
</object>
<reference key="parent" ref="560875128"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4599</int>
<reference key="object" ref="754695396"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="908114002"/>
</object>
<reference key="parent" ref="560875128"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4600</int>
<reference key="object" ref="421148087"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="647762012"/>
</object>
<reference key="parent" ref="560875128"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4601</int>
<reference key="object" ref="541882601"/>
<reference key="parent" ref="560875128"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4602</int>
<reference key="object" ref="647762012"/>
<reference key="parent" ref="421148087"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4603</int>
<reference key="object" ref="908114002"/>
<reference key="parent" ref="754695396"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4604</int>
<reference key="object" ref="923605742"/>
<reference key="parent" ref="811878628"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4605</int>
<reference key="object" ref="819871674"/>
<reference key="parent" ref="844737467"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4608</int>
<reference key="object" ref="823365566"/>
<reference key="parent" ref="1017583928"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4615</int>
<reference key="object" ref="177357217"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="678671392"/>
</object>
<reference key="parent" ref="560875128"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4616</int>
<reference key="object" ref="678671392"/>
<reference key="parent" ref="177357217"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4617</int>
<reference key="object" ref="103751139"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="385075814"/>
</object>
<reference key="parent" ref="560875128"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4618</int>
<reference key="object" ref="385075814"/>
<reference key="parent" ref="103751139"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4622</int>
<reference key="object" ref="935681074"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="247978791"/>
</object>
<reference key="parent" ref="560875128"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4623</int>
<reference key="object" ref="247978791"/>
<reference key="parent" ref="935681074"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
......@@ -9621,8 +9908,6 @@ LCAuLi4</string>
<string>240.ImportedFromIB2</string>
<string>2402.IBPluginDependency</string>
<string>2402.ImportedFromIB2</string>
<string>241.IBPluginDependency</string>
<string>241.ImportedFromIB2</string>
<string>2416.IBEditorWindowLastContentRect</string>
<string>2416.IBPluginDependency</string>
<string>2416.IBWindowTemplateEditedContentRect</string>
......@@ -9633,8 +9918,6 @@ LCAuLi4</string>
<string>2418.ImportedFromIB2</string>
<string>2419.IBPluginDependency</string>
<string>2419.ImportedFromIB2</string>
<string>242.IBPluginDependency</string>
<string>242.ImportedFromIB2</string>
<string>2420.IBPluginDependency</string>
<string>2420.ImportedFromIB2</string>
<string>2421.CustomClassName</string>
......@@ -9993,7 +10276,6 @@ LCAuLi4</string>
<string>4383.ImportedFromIB2</string>
<string>4384.IBPluginDependency</string>
<string>4384.ImportedFromIB2</string>
<string>4389.IBPluginDependency</string>
<string>4392.IBPluginDependency</string>
<string>4393.IBPluginDependency</string>
<string>4397.IBPluginDependency</string>
......@@ -10039,6 +10321,27 @@ LCAuLi4</string>
<string>4440.IBPluginDependency</string>
<string>446.IBPluginDependency</string>
<string>446.ImportedFromIB2</string>
<string>4596.IBEditorWindowLastContentRect</string>
<string>4596.IBPluginDependency</string>
<string>4597.IBPluginDependency</string>
<string>4598.IBPluginDependency</string>
<string>4599.IBPluginDependency</string>
<string>4600.IBPluginDependency</string>
<string>4601.IBPluginDependency</string>
<string>4602.IBPluginDependency</string>
<string>4603.IBPluginDependency</string>
<string>4604.IBPluginDependency</string>
<string>4605.IBPluginDependency</string>
<string>4608.IBPluginDependency</string>
<string>4615.IBPluginDependency</string>
<string>4615.IBViewBoundsToFrameTransform</string>
<string>4616.IBPluginDependency</string>
<string>4617.IBPluginDependency</string>
<string>4617.IBViewBoundsToFrameTransform</string>
<string>4618.IBPluginDependency</string>
<string>4622.IBPluginDependency</string>
<string>4622.IBViewBoundsToFrameTransform</string>
<string>4623.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
<string>5.ImportedFromIB2</string>
<string>56.IBPluginDependency</string>
......@@ -10330,7 +10633,7 @@ LCAuLi4</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{517, 353}, {222, 383}}</string>
<string>{{517, 393}, {222, 343}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -10354,13 +10657,9 @@ LCAuLi4</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{243, 631}, {238, 63}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{340, 683}, {238, 63}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{340, 683}, {238, 63}}</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{243, 631}, {238, 63}}</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
......@@ -10763,7 +11062,6 @@ LCAuLi4</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>
<boolean value="YES"/>
<string>{{816, 510}, {64, 6}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -10822,6 +11120,33 @@ LCAuLi4</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{633, 470}, {307, 53}}</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>
<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+AAABBmAAAwkwAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDYwAAwkgAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABB2AAAwiwAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -10888,7 +11213,7 @@ LCAuLi4</string>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">4595</int>
<int key="maxID">4625</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
......@@ -11688,6 +12013,7 @@ LCAuLi4</string>
<string>openForum:</string>
<string>openReadMe:</string>
<string>openWebsite:</string>
<string>setPlaybackRate:</string>
<string>showAudioEffects:</string>
<string>showBookmarks:</string>
<string>showInformationPanel:</string>
......@@ -11726,6 +12052,7 @@ LCAuLi4</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
......@@ -11743,6 +12070,7 @@ LCAuLi4</string>
<string>openForum:</string>
<string>openReadMe:</string>
<string>openWebsite:</string>
<string>setPlaybackRate:</string>
<string>showAudioEffects:</string>
<string>showBookmarks:</string>
<string>showInformationPanel:</string>
......@@ -11802,6 +12130,10 @@ LCAuLi4</string>
<string key="name">openWebsite:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">setPlaybackRate:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showAudioEffects:</string>
<string key="candidateClassName">id</string>
......@@ -11889,7 +12221,6 @@ LCAuLi4</string>
<string>o_mi_donation</string>
<string>o_mi_double_window</string>
<string>o_mi_errorsAndWarnings</string>
<string>o_mi_faster</string>
<string>o_mi_ffmpeg_pp</string>
<string>o_mi_fittoscreen</string>
<string>o_mi_floatontop</string>
......@@ -11907,7 +12238,6 @@ LCAuLi4</string>
<string>o_mi_minimize</string>
<string>o_mi_mute</string>
<string>o_mi_next</string>
<string>o_mi_normalSpeed</string>
<string>o_mi_normal_window</string>
<string>o_mi_open_capture</string>
<string>o_mi_open_disc</string>
......@@ -11927,13 +12257,21 @@ LCAuLi4</string>
<string>o_mi_quit</string>
<string>o_mi_quitAfterPB</string>
<string>o_mi_random</string>
<string>o_mi_rate</string>
<string>o_mi_rate_faster_lbl</string>
<string>o_mi_rate_fld</string>
<string>o_mi_rate_lbl</string>
<string>o_mi_rate_lbl_gray</string>
<string>o_mi_rate_normal_lbl</string>
<string>o_mi_rate_sld</string>
<string>o_mi_rate_slower_lbl</string>
<string>o_mi_rate_view</string>
<string>o_mi_readme</string>
<string>o_mi_repeat</string>
<string>o_mi_screen</string>
<string>o_mi_select_all</string>
<string>o_mi_services</string>
<string>o_mi_show_all</string>
<string>o_mi_slower</string>
<string>o_mi_snapshot</string>
<string>o_mi_stop</string>
<string>o_mi_subtitle</string>
......@@ -12060,8 +12398,14 @@ LCAuLi4</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>NSView</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
......@@ -12160,7 +12504,6 @@ LCAuLi4</string>
<string>o_mi_donation</string>
<string>o_mi_double_window</string>
<string>o_mi_errorsAndWarnings</string>
<string>o_mi_faster</string>
<string>o_mi_ffmpeg_pp</string>
<string>o_mi_fittoscreen</string>
<string>o_mi_floatontop</string>
......@@ -12178,7 +12521,6 @@ LCAuLi4</string>
<string>o_mi_minimize</string>
<string>o_mi_mute</string>
<string>o_mi_next</string>
<string>o_mi_normalSpeed</string>
<string>o_mi_normal_window</string>
<string>o_mi_open_capture</string>
<string>o_mi_open_disc</string>
......@@ -12198,13 +12540,21 @@ LCAuLi4</string>
<string>o_mi_quit</string>
<string>o_mi_quitAfterPB</string>
<string>o_mi_random</string>
<string>o_mi_rate</string>
<string>o_mi_rate_faster_lbl</string>
<string>o_mi_rate_fld</string>
<string>o_mi_rate_lbl</string>
<string>o_mi_rate_lbl_gray</string>
<string>o_mi_rate_normal_lbl</string>
<string>o_mi_rate_sld</string>
<string>o_mi_rate_slower_lbl</string>
<string>o_mi_rate_view</string>
<string>o_mi_readme</string>
<string>o_mi_repeat</string>
<string>o_mi_screen</string>
<string>o_mi_select_all</string>
<string>o_mi_services</string>
<string>o_mi_show_all</string>
<string>o_mi_slower</string>
<string>o_mi_snapshot</string>
<string>o_mi_stop</string>
<string>o_mi_subtitle</string>
......@@ -12393,10 +12743,6 @@ LCAuLi4</string>
<string key="name">o_mi_errorsAndWarnings</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_faster</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_ffmpeg_pp</string>
<string key="candidateClassName">NSMenuItem</string>
......@@ -12465,10 +12811,6 @@ LCAuLi4</string>
<string key="name">o_mi_next</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_normalSpeed</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_normal_window</string>
<string key="candidateClassName">NSMenuItem</string>
......@@ -12545,6 +12887,42 @@ LCAuLi4</string>
<string key="name">o_mi_random</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_rate</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_rate_faster_lbl</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_rate_fld</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_rate_lbl</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_rate_lbl_gray</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_rate_normal_lbl</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_rate_sld</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_rate_slower_lbl</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_rate_view</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_readme</string>
<string key="candidateClassName">NSMenuItem</string>
......@@ -12569,10 +12947,6 @@ LCAuLi4</string>
<string key="name">o_mi_show_all</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_slower</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_snapshot</string>
<string key="candidateClassName">NSMenuItem</string>
......
modules/gui/macosx/CoreInteraction.h
View file @ e9947e6f
......@@ -26,6 +26,7 @@
#import <vlc_interface.h>
@interface VLCCoreInteraction : NSObject {
int i_currentPlaybackRate;
BOOL b_lockAspectRatio;
}
+ (VLCCoreInteraction *)sharedInstance;
......@@ -35,6 +36,8 @@
- (void)faster;
- (void)slower;
- (void)normalSpeed;
- (void)setPlaybackRate:(int)i_value;
- (int)playbackRate;
- (void)next;
- (void)previous;
- (void)forward;
......
modules/gui/macosx/CoreInteraction.m
View file @ e9947e6f
......@@ -29,6 +29,7 @@
#import <vlc_input.h>
#import <vlc_keys.h>
#import <vlc_osd.h>
#import <vlc_aout_intf.h>
@implementation VLCCoreInteraction
static VLCCoreInteraction *_o_sharedInstance = nil;
......@@ -112,6 +113,34 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_RATE_NORMAL );
}
- (void)setPlaybackRate:(int)i_value
{
playlist_t * p_playlist = pl_Get( VLCIntf );
double speed = pow( 2, (double)i_value / 17 );
int rate = INPUT_RATE_DEFAULT / speed;
if( i_currentPlaybackRate != rate )
var_SetFloat( p_playlist, "rate", (float)INPUT_RATE_DEFAULT / (float)rate );
i_currentPlaybackRate = rate;
}
- (int)playbackRate
{
playlist_t * p_playlist = pl_Get( VLCIntf );
float rate = var_GetFloat( p_playlist, "rate" );
double value = 17 * log( rate ) / log( 2. );
int returnValue = (int) ( ( value > 0 ) ? value + .5 : value - .5 );
if( returnValue < -34 )
returnValue = -34;
else if( returnValue > 34 )
returnValue = 34;
i_currentPlaybackRate = returnValue;
return returnValue;
}
- (void)previous
{
var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_PREV );
......
modules/gui/macosx/MainMenu.h
View file @ e9947e6f
......@@ -74,9 +74,15 @@
IBOutlet NSMenu * o_mu_controls;
IBOutlet NSMenuItem * o_mi_play;
IBOutlet NSMenuItem * o_mi_stop;
IBOutlet NSMenuItem * o_mi_faster;
IBOutlet NSMenuItem * o_mi_slower;
IBOutlet NSMenuItem * o_mi_normalSpeed;
IBOutlet NSMenuItem * o_mi_rate;
IBOutlet NSView * o_mi_rate_view;
IBOutlet id o_mi_rate_lbl;
IBOutlet id o_mi_rate_lbl_gray;
IBOutlet id o_mi_rate_slower_lbl;
IBOutlet id o_mi_rate_normal_lbl;
IBOutlet id o_mi_rate_faster_lbl;
IBOutlet id o_mi_rate_sld;
IBOutlet id o_mi_rate_fld;
IBOutlet NSMenuItem * o_mi_trackSynchronization;
IBOutlet NSMenuItem * o_mi_previous;
IBOutlet NSMenuItem * o_mi_next;
......@@ -189,6 +195,7 @@
- (void)setupMenus;
- (void)refreshVoutDeviceMenu:(NSNotification *)o_notification;
- (void)setSubmenusEnabled:(BOOL)b_enabled;
- (void)setRateControlsEnabled:(BOOL)b_enabled;
- (IBAction)clearRecentItems:(id)sender;
- (void)openRecentItem:(id)item;
......@@ -199,6 +206,8 @@
- (IBAction)intfOpenNet:(id)sender;
- (IBAction)intfOpenCapture:(id)sender;
- (IBAction)setPlaybackRate:(id)sender;
- (IBAction)showWizard:(id)sender;
- (IBAction)showVideoEffects:(id)sender;
- (IBAction)showAudioEffects:(id)sender;
......
modules/gui/macosx/MainMenu.m
View file @ e9947e6f
......@@ -117,15 +117,6 @@ static VLCMainMenu *_o_sharedInstance = nil;
o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-stop" )];
[o_mi_stop setKeyEquivalent: [o_vlcmain VLCKeyToString: o_key]];
[o_mi_stop setKeyEquivalentModifierMask: [o_vlcmain VLCModifiersToCocoa:o_key]];
o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-faster" )];
[o_mi_faster setKeyEquivalent: [o_vlcmain VLCKeyToString: o_key]];
[o_mi_faster setKeyEquivalentModifierMask: [o_vlcmain VLCModifiersToCocoa:o_key]];
o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-slower" )];
[o_mi_slower setKeyEquivalent: [o_vlcmain VLCKeyToString: o_key]];
[o_mi_slower setKeyEquivalentModifierMask: [o_vlcmain VLCModifiersToCocoa:o_key]];
o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-rate-normal" )];
[o_mi_normalSpeed setKeyEquivalent: [o_vlcmain VLCKeyToString: o_key]];
[o_mi_normalSpeed setKeyEquivalentModifierMask: [o_vlcmain VLCModifiersToCocoa:o_key]];
o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-prev" )];
[o_mi_previous setKeyEquivalent: [o_vlcmain VLCKeyToString: o_key]];
[o_mi_previous setKeyEquivalentModifierMask: [o_vlcmain VLCModifiersToCocoa:o_key]];
......@@ -215,9 +206,12 @@ static VLCMainMenu *_o_sharedInstance = nil;
[o_mu_controls setTitle: _NS("Playback")];
[o_mi_play setTitle: _NS("Play")];
[o_mi_stop setTitle: _NS("Stop")];
[o_mi_faster setTitle: _NS("Faster")];
[o_mi_slower setTitle: _NS("Slower")];
[o_mi_normalSpeed setTitle: _NS("Normal rate")];
[o_mi_rate setView: o_mi_rate_view];
[o_mi_rate_lbl setStringValue: _NS("Playback Speed")];
[o_mi_rate_lbl_gray setStringValue: _NS("Playback Speed")];
[o_mi_rate_slower_lbl setStringValue: _NS("Slower")];
[o_mi_rate_normal_lbl setStringValue: _NS("Normal")];
[o_mi_rate_faster_lbl setStringValue: _NS("Faster")];
[o_mi_trackSynchronization setTitle: _NS("Track Synchronization")];
[o_mi_previous setTitle: _NS("Previous")];
[o_mi_next setTitle: _NS("Next")];
......@@ -464,6 +458,25 @@ static VLCMainMenu *_o_sharedInstance = nil;
[o_mi_teletext setEnabled: b_enabled];
}
- (void)setRateControlsEnabled:(BOOL)b_enabled
{
[o_mi_rate_sld setEnabled: b_enabled];
[o_mi_rate_sld setIntValue: [[VLCCoreInteraction sharedInstance] playbackRate]];
int i = [[VLCCoreInteraction sharedInstance] playbackRate];
if (i == 0)
i = 1;
[o_mi_rate_fld setStringValue: [NSString stringWithFormat:@"%ix", i]];
if (b_enabled) {
[o_mi_rate_lbl setHidden: NO];
[o_mi_rate_lbl_gray setHidden: YES];
}
else
{
[o_mi_rate_lbl setHidden: YES];
[o_mi_rate_lbl_gray setHidden: NO];
}
}
#pragma mark -
#pragma mark Recent Items
- (void)openRecentItem:(id)item
......@@ -477,6 +490,18 @@ static VLCMainMenu *_o_sharedInstance = nil;
clearRecentDocuments: nil];
}
#pragma mark -
#pragma mark Playback
- (IBAction)setPlaybackRate:(id)sender
{
[[VLCCoreInteraction sharedInstance] setPlaybackRate: [o_mi_rate_sld intValue]];
int i = [[VLCCoreInteraction sharedInstance] playbackRate];
if (i == 0)
i = 1;
[o_mi_rate_fld setStringValue: [NSString stringWithFormat:@"%ix", i]];
}
#pragma mark -
#pragma mark Panels
......@@ -956,19 +981,6 @@ static VLCMainMenu *_o_sharedInstance = nil;
bEnabled = FALSE;
}
}
else if( [o_title isEqualToString: _NS("Faster")] ||
[o_title isEqualToString: _NS("Slower")] ||
[o_title isEqualToString: _NS("Normal rate")] )
{
if( p_input != NULL )
{
bEnabled = var_GetBool( p_input, "can-rate" );
}
else
{
bEnabled = FALSE;
}
}
else if( [o_title isEqualToString: _NS("Stop")] )
{
if( p_input == NULL )
......
modules/gui/macosx/intf.m
View file @ e9947e6f
......@@ -1428,6 +1428,7 @@ static void manage_cleanup( void * args )
[o_embedded_window setPrev: (b_plmul || b_chapters)];
[o_btn_next setEnabled: (b_plmul || b_chapters)];
[o_embedded_window setNext: (b_plmul || b_chapters)];
[o_mainmenu setRateControlsEnabled: b_control];
[o_timeslider setFloatValue: 0.0];
[o_timeslider setEnabled: b_seekable];
......
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