Skip to content

V
vlc-2-2
Commit 3b66dabc authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: remove the extended controls panel since all of its functionality is... 

macosx: remove the extended controls panel since all of its functionality is present in the * effects panels now
parent 68258909
Hide whitespace changes
Inline Side-by-side
Showing with 310 additions and 3959 deletions
Makefile.am
View file @ 3b66dabc
......@@ -131,8 +131,6 @@ EXTRA_DIST += \
extras/package/macosx/Resources/English.lproj/Wizard.nib/keyedobjects.nib \
extras/package/macosx/Resources/English.lproj/Bookmarks.nib/designable.nib \
extras/package/macosx/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \
extras/package/macosx/Resources/English.lproj/Extended.nib/designable.nib \
extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib \
extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/designable.nib \
extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/keyedobjects.nib \
extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/designable.nib \
......@@ -447,8 +445,6 @@ VLC-release.app: vlc
voutgl.m \
wizard.h \
wizard.m \
extended.h \
extended.m \
bookmarks.h \
bookmarks.m \
coredialogs.h \
......@@ -585,8 +581,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
voutgl.m \
wizard.h \
wizard.m \
extended.h \
extended.m \
bookmarks.h \
bookmarks.m \
coredialogs.h \
......
extras/package/macosx/Resources/English.lproj/Extended.nib/designable.nib deleted 100644 → 0
View file @ 68258909
This source diff could not be displayed because it is too large. You can view the blob instead.
extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
View file @ 3b66dabc
......@@ -2,19 +2,19 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1040</int>
<string key="IBDocument.SystemVersion">11A444d</string>
<string key="IBDocument.SystemVersion">11A480b</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1119.1</string>
<string key="IBDocument.HIToolboxVersion">555.00</string>
<string key="IBDocument.AppKitVersion">1127</string>
<string key="IBDocument.HIToolboxVersion">561.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="3568"/>
<integer value="24"/>
<integer value="3654"/>
<integer value="24"/>
<integer value="3568"/>
<integer value="2197"/>
<integer value="2417"/>
</object>
......@@ -1506,7 +1506,7 @@
</object>
<object class="NSMenuItem" id="96198661">
<reference key="NSMenu" ref="1016637396"/>
<string key="NSTitle">Extended Controls...</string>
<string key="NSTitle">Video Effects...</string>
<string key="NSKeyEquiv">e</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
......@@ -5606,14 +5606,6 @@ LCAuLi4</string>
</object>
<int key="connectionID">2315</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_extended</string>
<reference key="source" ref="199714555"/>
<reference key="destination" ref="96198661"/>
</object>
<int key="connectionID">2391</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_bookmarks</string>
......@@ -5662,14 +5654,6 @@ LCAuLi4</string>
</object>
<int key="connectionID">2406</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showExtended:</string>
<reference key="source" ref="199714555"/>
<reference key="destination" ref="96198661"/>
</object>
<int key="connectionID">2413</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">windowAction:</string>
......@@ -6958,6 +6942,22 @@ LCAuLi4</string>
</object>
<int key="connectionID">4414</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showVideoEffects:</string>
<reference key="source" ref="199714555"/>
<reference key="destination" ref="96198661"/>
</object>
<int key="connectionID">4415</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_videoeffects</string>
<reference key="source" ref="199714555"/>
<reference key="destination" ref="96198661"/>
</object>
<int key="connectionID">4416</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
......@@ -10978,7 +10978,7 @@ LCAuLi4</string>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">4414</int>
<int key="maxID">4416</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
......@@ -11015,11 +11015,11 @@ LCAuLi4</string>
<string>saveDebugLog:</string>
<string>showAudioEffects:</string>
<string>showBookmarks:</string>
<string>showExtended:</string>
<string>showInformationPanel:</string>
<string>showLicense:</string>
<string>showMessagesPanel:</string>
<string>showTrackSynchronization:</string>
<string>showVideoEffects:</string>
<string>showWizard:</string>
<string>timeFieldWasClicked:</string>
<string>timesliderUpdate:</string>
......@@ -11084,11 +11084,11 @@ LCAuLi4</string>
<string>saveDebugLog:</string>
<string>showAudioEffects:</string>
<string>showBookmarks:</string>
<string>showExtended:</string>
<string>showInformationPanel:</string>
<string>showLicense:</string>
<string>showMessagesPanel:</string>
<string>showTrackSynchronization:</string>
<string>showVideoEffects:</string>
<string>showWizard:</string>
<string>timeFieldWasClicked:</string>
<string>timesliderUpdate:</string>
......@@ -11168,10 +11168,6 @@ LCAuLi4</string>
<string key="name">showBookmarks:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showExtended:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showInformationPanel:</string>
<string key="candidateClassName">id</string>
......@@ -11188,6 +11184,10 @@ LCAuLi4</string>
<string key="name">showTrackSynchronization:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showVideoEffects:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showWizard:</string>
<string key="candidateClassName">id</string>
......@@ -11255,7 +11255,6 @@ LCAuLi4</string>
<string>o_dmi_stop</string>
<string>o_embedded_list</string>
<string>o_embedded_window</string>
<string>o_extended</string>
<string>o_eyetv</string>
<string>o_main_pgbar</string>
<string>o_messages</string>
......@@ -11286,7 +11285,6 @@ LCAuLi4</string>
<string>o_mi_donation</string>
<string>o_mi_double_window</string>
<string>o_mi_errorsAndWarnings</string>
<string>o_mi_extended</string>
<string>o_mi_faster</string>
<string>o_mi_ffmpeg_pp</string>
<string>o_mi_fittoscreen</string>
......@@ -11347,6 +11345,7 @@ LCAuLi4</string>
<string>o_mi_teletext_yellow</string>
<string>o_mi_title</string>
<string>o_mi_trackSynchronization</string>
<string>o_mi_videoeffects</string>
<string>o_mi_videotrack</string>
<string>o_mi_visual</string>
<string>o_mi_vol_down</string>
......@@ -11387,6 +11386,7 @@ LCAuLi4</string>
<string>o_timefield</string>
<string>o_timeslider</string>
<string>o_trackSynchronization</string>
<string>o_videoeffects</string>
<string>o_vmi_fullscreen</string>
<string>o_vmi_mute</string>
<string>o_vmi_next</string>
......@@ -11434,7 +11434,6 @@ LCAuLi4</string>
<string>id</string>
<string>VLCEmbeddedWindow</string>
<string>id</string>
<string>id</string>
<string>NSProgressIndicator</string>
<string>NSTextView</string>
<string>NSMenuItem</string>
......@@ -11565,6 +11564,7 @@ LCAuLi4</string>
<string>NSTextField</string>
<string>NSSlider</string>
<string>id</string>
<string>id</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
......@@ -11614,7 +11614,6 @@ LCAuLi4</string>
<string>o_dmi_stop</string>
<string>o_embedded_list</string>
<string>o_embedded_window</string>
<string>o_extended</string>
<string>o_eyetv</string>
<string>o_main_pgbar</string>
<string>o_messages</string>
......@@ -11645,7 +11644,6 @@ LCAuLi4</string>
<string>o_mi_donation</string>
<string>o_mi_double_window</string>
<string>o_mi_errorsAndWarnings</string>
<string>o_mi_extended</string>
<string>o_mi_faster</string>
<string>o_mi_ffmpeg_pp</string>
<string>o_mi_fittoscreen</string>
......@@ -11706,6 +11704,7 @@ LCAuLi4</string>
<string>o_mi_teletext_yellow</string>
<string>o_mi_title</string>
<string>o_mi_trackSynchronization</string>
<string>o_mi_videoeffects</string>
<string>o_mi_videotrack</string>
<string>o_mi_visual</string>
<string>o_mi_vol_down</string>
......@@ -11746,6 +11745,7 @@ LCAuLi4</string>
<string>o_timefield</string>
<string>o_timeslider</string>
<string>o_trackSynchronization</string>
<string>o_videoeffects</string>
<string>o_vmi_fullscreen</string>
<string>o_vmi_mute</string>
<string>o_vmi_next</string>
......@@ -11879,10 +11879,6 @@ LCAuLi4</string>
<string key="name">o_embedded_window</string>
<string key="candidateClassName">VLCEmbeddedWindow</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_extended</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_eyetv</string>
<string key="candidateClassName">id</string>
......@@ -12003,10 +11999,6 @@ LCAuLi4</string>
<string key="name">o_mi_errorsAndWarnings</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_extended</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_faster</string>
<string key="candidateClassName">NSMenuItem</string>
......@@ -12247,6 +12239,10 @@ LCAuLi4</string>
<string key="name">o_mi_trackSynchronization</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_videoeffects</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_videotrack</string>
<string key="candidateClassName">NSMenuItem</string>
......@@ -12407,6 +12403,10 @@ LCAuLi4</string>
<string key="name">o_trackSynchronization</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_videoeffects</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_vmi_fullscreen</string>
<string key="candidateClassName">NSMenuItem</string>
......
extras/package/macosx/Resources/English.lproj/VideoEffects.nib/designable.nib
View file @ 3b66dabc
......@@ -21,7 +21,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="3"/>
<integer value="2"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -91,14 +91,14 @@
<string key="NSReuseIdentifierKey">_NS:209</string>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDSliderCell" key="NSCell" id="1048958433">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents"/>
<string key="NSCellIdentifier">_NS:209</string>
<reference key="NSControlView" ref="665985520"/>
<double key="NSMaxValue">100</double>
<double key="NSMaxValue">3</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">50</double>
<double key="NSValue">1</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
......@@ -115,14 +115,14 @@
<string key="NSReuseIdentifierKey">_NS:209</string>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDSliderCell" key="NSCell" id="880862519">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents"/>
<string key="NSCellIdentifier">_NS:209</string>
<reference key="NSControlView" ref="714538558"/>
<double key="NSMaxValue">100</double>
<double key="NSMaxValue">2</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">50</double>
<double key="NSValue">1</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
......@@ -270,14 +270,14 @@
<string key="NSReuseIdentifierKey">_NS:209</string>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDSliderCell" key="NSCell" id="631341256">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents"/>
<string key="NSCellIdentifier">_NS:209</string>
<reference key="NSControlView" ref="248577800"/>
<double key="NSMaxValue">100</double>
<double key="NSMaxValue">1</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">50</double>
<double key="NSValue">1</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
......@@ -294,14 +294,14 @@
<string key="NSReuseIdentifierKey">_NS:209</string>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDSliderCell" key="NSCell" id="1043425917">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents"/>
<string key="NSCellIdentifier">_NS:209</string>
<reference key="NSControlView" ref="1033837370"/>
<double key="NSMaxValue">100</double>
<double key="NSMaxValue">360</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">50</double>
<double key="NSValue">0.0</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
......@@ -318,14 +318,14 @@
<string key="NSReuseIdentifierKey">_NS:209</string>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDSliderCell" key="NSCell" id="733566762">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents"/>
<string key="NSCellIdentifier">_NS:209</string>
<reference key="NSControlView" ref="376722054"/>
<double key="NSMaxValue">100</double>
<double key="NSMaxValue">2</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">50</double>
<double key="NSValue">1</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
......@@ -342,14 +342,14 @@
<string key="NSReuseIdentifierKey">_NS:209</string>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDSliderCell" key="NSCell" id="920103185">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents"/>
<string key="NSCellIdentifier">_NS:209</string>
<reference key="NSControlView" ref="760066178"/>
<double key="NSMaxValue">100</double>
<double key="NSMaxValue">10</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">50</double>
<double key="NSValue">1</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
......@@ -495,14 +495,14 @@
<string key="NSReuseIdentifierKey">_NS:209</string>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDSliderCell" key="NSCell" id="33387376">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents"/>
<string key="NSCellIdentifier">_NS:209</string>
<reference key="NSControlView" ref="75681829"/>
<double key="NSMaxValue">100</double>
<double key="NSMaxValue">2</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">50</double>
<double key="NSValue">0.050000000000000003</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
......@@ -593,23 +593,23 @@
<object class="NSSlider" id="484297776">
<reference key="NSNextResponder" ref="832363197"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{119, 13}, {171, 15}}</string>
<string key="NSFrame">{{119, 10}, {171, 18}}</string>
<reference key="NSSuperview" ref="832363197"/>
<string key="NSReuseIdentifierKey">_NS:209</string>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDSliderCell" key="NSCell" id="122431818">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents"/>
<string key="NSCellIdentifier">_NS:209</string>
<reference key="NSControlView" ref="484297776"/>
<double key="NSMaxValue">100</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">50</double>
<double key="NSMaxValue">32</double>
<double key="NSMinValue">4</double>
<double key="NSValue">16</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
<bool key="NSAllowsTickMarkValuesOnly">NO</bool>
<int key="NSNumberOfTickMarks">8</int>
<int key="NSTickMarkPosition">0</int>
<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
<bool key="NSVertical">NO</bool>
<string key="themeKey">gradientTheme</string>
</object>
......@@ -701,14 +701,14 @@
<string key="NSReuseIdentifierKey">_NS:209</string>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDSliderCell" key="NSCell" id="273680894">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents"/>
<string key="NSCellIdentifier">_NS:209</string>
<reference key="NSControlView" ref="288762928"/>
<double key="NSMaxValue">100</double>
<double key="NSMaxValue">40</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">50</double>
<double key="NSValue">2</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
......@@ -1295,7 +1295,7 @@
<object class="NSTabViewItem" id="160045531">
<string key="NSIdentifier">geometry</string>
<object class="NSView" key="NSView" id="934925915">
<reference key="NSNextResponder" ref="898819366"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -1783,7 +1783,6 @@
</object>
</object>
<string key="NSFrame">{{10, 33}, {638, 197}}</string>
<reference key="NSSuperview" ref="898819366"/>
</object>
<string key="NSLabel">Geometry</string>
<reference key="NSColor" ref="279270326"/>
......@@ -1792,7 +1791,7 @@
<object class="NSTabViewItem" id="133975353">
<string key="NSIdentifier">color</string>
<object class="NSView" key="NSView" id="10628740">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder" ref="898819366"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -2389,7 +2388,10 @@
<string>allowsFloats</string>
<string>formatterBehavior</string>
<string>locale</string>
<string>maximum</string>
<string>maximumIntegerDigits</string>
<string>minimum</string>
<string>minimumIntegerDigits</string>
<string>negativeFormat</string>
<string>negativeInfinitySymbol</string>
<string>nilSymbol</string>
......@@ -2403,7 +2405,10 @@
<boolean value="NO"/>
<integer value="1040"/>
<reference ref="1015810800"/>
<real value="1"/>
<real value="255"/>
<integer value="255"/>
<real value="0.0"/>
<integer value="0"/>
<string>0</string>
<string>-∞</string>
<string/>
......@@ -2425,8 +2430,8 @@
<string key="NSString">NaN</string>
<reference key="NSAttributes" ref="639313226"/>
</object>
<real value="1" key="NS.min"/>
<reference key="NS.max" ref="1005529056"/>
<real value="0.0" key="NS.min"/>
<real value="255" key="NS.max"/>
<object class="NSDecimalNumberHandler" key="NS.rounding">
<int key="NS.roundingmode">1</int>
<bool key="NS.raise.overflow">YES</bool>
......@@ -2459,10 +2464,10 @@
<reference key="NSSupport" ref="26"/>
<string key="NSCellIdentifier">_NS:775</string>
<reference key="NSControlView" ref="614130362"/>
<double key="NSValue">30</double>
<double key="NSMinValue">1</double>
<double key="NSMaxValue">100</double>
<double key="NSValue">100</double>
<double key="NSMaxValue">255</double>
<double key="NSIncrement">1</double>
<bool key="NSValueWraps">YES</bool>
<bool key="NSAutorepeat">YES</bool>
</object>
</object>
......@@ -2657,14 +2662,14 @@
<string key="NSReuseIdentifierKey">_NS:209</string>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDSliderCell" key="NSCell" id="243147203">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents"/>
<string key="NSCellIdentifier">_NS:209</string>
<reference key="NSControlView" ref="148511149"/>
<double key="NSMaxValue">100</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">50</double>
<double key="NSMaxValue">127</double>
<double key="NSMinValue">1</double>
<double key="NSValue">80</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
......@@ -2763,14 +2768,14 @@
<string key="NSReuseIdentifierKey">_NS:209</string>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDSliderCell" key="NSCell" id="1016611155">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">67501824</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents"/>
<string key="NSCellIdentifier">_NS:209</string>
<reference key="NSControlView" ref="540871009"/>
<double key="NSMaxValue">100</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">50</double>
<double key="NSValue">20</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
......@@ -2806,14 +2811,14 @@
<string key="NSReuseIdentifierKey">_NS:209</string>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDSliderCell" key="NSCell" id="92806680">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents"/>
<string key="NSCellIdentifier">_NS:209</string>
<reference key="NSControlView" ref="538371352"/>
<double key="NSMaxValue">100</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">50</double>
<double key="NSValue">15</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
......@@ -2870,7 +2875,6 @@
<object class="BGHUDTextFieldCell" key="NSCell" id="580154870">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags2">138544128</int>
<string key="NSContents">FF0000</string>
<reference key="NSSupport" ref="26"/>
<string key="NSCellIdentifier">_NS:76</string>
<reference key="NSControlView" ref="1069462988"/>
......@@ -2908,6 +2912,7 @@
</object>
</object>
<string key="NSFrame">{{10, 33}, {638, 197}}</string>
<reference key="NSSuperview" ref="898819366"/>
</object>
<string key="NSLabel">Color</string>
<reference key="NSColor" ref="279270326"/>
......@@ -3630,14 +3635,14 @@
<string key="NSReuseIdentifierKey">_NS:209</string>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDSliderCell" key="NSCell" id="972356555">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents"/>
<string key="NSCellIdentifier">_NS:209</string>
<reference key="NSControlView" ref="974397022"/>
<double key="NSMaxValue">100</double>
<double key="NSMaxValue">255</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">50</double>
<double key="NSValue">255</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
......@@ -4010,7 +4015,7 @@
<reference key="NSTabView" ref="898819366"/>
</object>
</object>
<reference key="NSSelectedTabViewItem" ref="160045531"/>
<reference key="NSSelectedTabViewItem" ref="133975353"/>
<object class="NSFont" key="NSFont">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
......@@ -4022,7 +4027,7 @@
<nil key="themeKey"/>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="934925915"/>
<reference ref="10628740"/>
</object>
</object>
</object>
......@@ -4034,7 +4039,7 @@
<string key="NSFrameAutosaveName">videoeffects</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSCustomObject" id="443700460">
<object class="NSCustomObject" id="707254443">
<string key="NSClassName">VLCVideoEffects</string>
</object>
</object>
......@@ -4148,7 +4153,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_window</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="1005"/>
</object>
<int key="connectionID">473</int>
......@@ -4156,7 +4161,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_addlogo_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="851614399"/>
</object>
<int key="connectionID">474</int>
......@@ -4164,7 +4169,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_addlogo_left_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="273610993"/>
</object>
<int key="connectionID">475</int>
......@@ -4172,7 +4177,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_addlogo_left_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="843751743"/>
</object>
<int key="connectionID">476</int>
......@@ -4180,7 +4185,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_addlogo_logo_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="515591962"/>
</object>
<int key="connectionID">477</int>
......@@ -4188,7 +4193,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_addlogo_logo_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="439386103"/>
</object>
<int key="connectionID">478</int>
......@@ -4196,7 +4201,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_addlogo_top_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="281324922"/>
</object>
<int key="connectionID">479</int>
......@@ -4204,7 +4209,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_addlogo_top_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="967386141"/>
</object>
<int key="connectionID">480</int>
......@@ -4212,7 +4217,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_addlogo_transparency_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="275224178"/>
</object>
<int key="connectionID">481</int>
......@@ -4220,7 +4225,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_addlogo_transparency_sld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="974397022"/>
</object>
<int key="connectionID">482</int>
......@@ -4228,7 +4233,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_addtext_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="830324038"/>
</object>
<int key="connectionID">483</int>
......@@ -4236,7 +4241,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_addtext_pos_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="509844824"/>
</object>
<int key="connectionID">484</int>
......@@ -4244,7 +4249,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_addtext_pos_pop</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="135717749"/>
</object>
<int key="connectionID">485</int>
......@@ -4252,7 +4257,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_addtext_text_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="341775592"/>
</object>
<int key="connectionID">486</int>
......@@ -4260,7 +4265,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_addtext_text_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="724529696"/>
</object>
<int key="connectionID">487</int>
......@@ -4268,7 +4273,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_brightness_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="372967191"/>
</object>
<int key="connectionID">488</int>
......@@ -4276,7 +4281,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_brightness_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="1023605254"/>
</object>
<int key="connectionID">489</int>
......@@ -4284,7 +4289,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_brightness_sld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="376722054"/>
</object>
<int key="connectionID">490</int>
......@@ -4292,7 +4297,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="702049168"/>
</object>
<int key="connectionID">491</int>
......@@ -4300,7 +4305,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_contrast_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="279446133"/>
</object>
<int key="connectionID">492</int>
......@@ -4308,7 +4313,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_contrast_sld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="714538558"/>
</object>
<int key="connectionID">493</int>
......@@ -4316,7 +4321,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_gamma_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="685913676"/>
</object>
<int key="connectionID">494</int>
......@@ -4324,7 +4329,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_gamma_sld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="760066178"/>
</object>
<int key="connectionID">495</int>
......@@ -4332,7 +4337,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_hue_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="396951138"/>
</object>
<int key="connectionID">496</int>
......@@ -4340,7 +4345,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_hue_sld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="1033837370"/>
</object>
<int key="connectionID">497</int>
......@@ -4348,7 +4353,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_opaque_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="502307597"/>
</object>
<int key="connectionID">498</int>
......@@ -4356,7 +4361,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_opaque_sld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="248577800"/>
</object>
<int key="connectionID">499</int>
......@@ -4364,7 +4369,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_saturation_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="1769326"/>
</object>
<int key="connectionID">500</int>
......@@ -4372,7 +4377,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_saturation_sld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="665985520"/>
</object>
<int key="connectionID">501</int>
......@@ -4380,7 +4385,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_banding_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="618355475"/>
</object>
<int key="connectionID">502</int>
......@@ -4388,7 +4393,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_banding_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="339419071"/>
</object>
<int key="connectionID">503</int>
......@@ -4396,7 +4401,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_banding_sld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="484297776"/>
</object>
<int key="connectionID">504</int>
......@@ -4404,7 +4409,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_blur_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="232141445"/>
</object>
<int key="connectionID">505</int>
......@@ -4412,7 +4417,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_blur_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="51109381"/>
</object>
<int key="connectionID">506</int>
......@@ -4420,7 +4425,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_blur_sld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="148511149"/>
</object>
<int key="connectionID">507</int>
......@@ -4428,7 +4433,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_clone_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="635659192"/>
</object>
<int key="connectionID">508</int>
......@@ -4436,7 +4441,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_clone_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="772228563"/>
</object>
<int key="connectionID">509</int>
......@@ -4444,7 +4449,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_clone_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="293125052"/>
</object>
<int key="connectionID">510</int>
......@@ -4452,7 +4457,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_crop_bottom_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="190644777"/>
</object>
<int key="connectionID">511</int>
......@@ -4460,7 +4465,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_crop_bottom_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="647574939"/>
</object>
<int key="connectionID">512</int>
......@@ -4468,7 +4473,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_crop_left_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="785525140"/>
</object>
<int key="connectionID">513</int>
......@@ -4476,7 +4481,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_crop_left_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="299779593"/>
</object>
<int key="connectionID">514</int>
......@@ -4484,7 +4489,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_crop_right_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="950709956"/>
</object>
<int key="connectionID">515</int>
......@@ -4492,7 +4497,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_crop_right_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="76138714"/>
</object>
<int key="connectionID">516</int>
......@@ -4500,7 +4505,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_crop_sync_left_right_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="447321799"/>
</object>
<int key="connectionID">517</int>
......@@ -4508,7 +4513,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_crop_sync_top_bottom_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="973277604"/>
</object>
<int key="connectionID">518</int>
......@@ -4516,7 +4521,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_crop_top_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="411363183"/>
</object>
<int key="connectionID">519</int>
......@@ -4524,7 +4529,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_crop_top_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="290531254"/>
</object>
<int key="connectionID">520</int>
......@@ -4532,7 +4537,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_eraselogo_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="659004942"/>
</object>
<int key="connectionID">521</int>
......@@ -4540,7 +4545,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_eraselogo_left_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="15696892"/>
</object>
<int key="connectionID">522</int>
......@@ -4548,7 +4553,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_eraselogo_left_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="354728705"/>
</object>
<int key="connectionID">523</int>
......@@ -4556,7 +4561,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_eraselogo_mask_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="381763111"/>
</object>
<int key="connectionID">524</int>
......@@ -4564,7 +4569,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_eraselogo_mask_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="730977237"/>
</object>
<int key="connectionID">525</int>
......@@ -4572,7 +4577,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_eraselogo_top_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="349672090"/>
</object>
<int key="connectionID">526</int>
......@@ -4580,7 +4585,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_eraselogo_top_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="579595891"/>
</object>
<int key="connectionID">527</int>
......@@ -4588,7 +4593,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_extract_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="866370700"/>
</object>
<int key="connectionID">528</int>
......@@ -4596,7 +4601,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_extract_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="79386836"/>
</object>
<int key="connectionID">529</int>
......@@ -4604,7 +4609,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_extract_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="158723583"/>
</object>
<int key="connectionID">530</int>
......@@ -4612,7 +4617,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_gradient_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="726246058"/>
</object>
<int key="connectionID">531</int>
......@@ -4620,7 +4625,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_gradient_cartoon_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="121731822"/>
</object>
<int key="connectionID">532</int>
......@@ -4628,7 +4633,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_gradient_color_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="275724926"/>
</object>
<int key="connectionID">533</int>
......@@ -4636,7 +4641,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_gradient_mode_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="239172455"/>
</object>
<int key="connectionID">534</int>
......@@ -4644,7 +4649,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_gradient_mode_pop</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="856105297"/>
</object>
<int key="connectionID">535</int>
......@@ -4652,7 +4657,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_grain_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="787792998"/>
</object>
<int key="connectionID">536</int>
......@@ -4660,7 +4665,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_grain_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="380036693"/>
</object>
<int key="connectionID">537</int>
......@@ -4668,7 +4673,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_grain_sld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="288762928"/>
</object>
<int key="connectionID">538</int>
......@@ -4676,7 +4681,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_invert_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="699678759"/>
</object>
<int key="connectionID">539</int>
......@@ -4684,7 +4689,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_motiondetect_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="679961475"/>
</object>
<int key="connectionID">540</int>
......@@ -4692,7 +4697,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_noise_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="531092636"/>
</object>
<int key="connectionID">541</int>
......@@ -4700,7 +4705,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_posterize_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="677375378"/>
</object>
<int key="connectionID">542</int>
......@@ -4708,7 +4713,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_posterize_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="967949481"/>
</object>
<int key="connectionID">543</int>
......@@ -4716,7 +4721,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_posterize_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="292300172"/>
</object>
<int key="connectionID">544</int>
......@@ -4724,7 +4729,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_psychedelic_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="158304666"/>
</object>
<int key="connectionID">545</int>
......@@ -4732,7 +4737,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_puzzle_blackslot_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="268273719"/>
</object>
<int key="connectionID">546</int>
......@@ -4740,7 +4745,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_puzzle_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="36160666"/>
</object>
<int key="connectionID">547</int>
......@@ -4748,7 +4753,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_puzzle_columns_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="227755793"/>
</object>
<int key="connectionID">548</int>
......@@ -4756,7 +4761,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_puzzle_columns_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="56743507"/>
</object>
<int key="connectionID">549</int>
......@@ -4764,7 +4769,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_puzzle_rows_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="357710165"/>
</object>
<int key="connectionID">550</int>
......@@ -4772,7 +4777,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_puzzle_rows_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="422916449"/>
</object>
<int key="connectionID">551</int>
......@@ -4780,7 +4785,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_sepia_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="317124105"/>
</object>
<int key="connectionID">552</int>
......@@ -4788,7 +4793,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_sepia_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="373866613"/>
</object>
<int key="connectionID">553</int>
......@@ -4796,7 +4801,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_sepia_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="1042139911"/>
</object>
<int key="connectionID">554</int>
......@@ -4804,7 +4809,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_sharpen_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="828169901"/>
</object>
<int key="connectionID">555</int>
......@@ -4812,7 +4817,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_sharpen_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="408106628"/>
</object>
<int key="connectionID">556</int>
......@@ -4820,7 +4825,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_sharpen_sld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="75681829"/>
</object>
<int key="connectionID">557</int>
......@@ -4828,7 +4833,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_threshold_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="937239453"/>
</object>
<int key="connectionID">558</int>
......@@ -4836,7 +4841,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_threshold_color_fld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="1069462988"/>
</object>
<int key="connectionID">559</int>
......@@ -4844,7 +4849,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_threshold_color_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="152203922"/>
</object>
<int key="connectionID">560</int>
......@@ -4852,7 +4857,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_threshold_saturation_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="1067643079"/>
</object>
<int key="connectionID">561</int>
......@@ -4860,7 +4865,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_threshold_saturation_sld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="540871009"/>
</object>
<int key="connectionID">562</int>
......@@ -4868,7 +4873,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_threshold_similarity_lbl</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="130646279"/>
</object>
<int key="connectionID">563</int>
......@@ -4876,7 +4881,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_threshold_similarity_sld</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="538371352"/>
</object>
<int key="connectionID">564</int>
......@@ -4884,7 +4889,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_transform_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="351076845"/>
</object>
<int key="connectionID">565</int>
......@@ -4892,7 +4897,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_transform_pop</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="401651452"/>
</object>
<int key="connectionID">566</int>
......@@ -4900,7 +4905,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_watereffect_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="834758738"/>
</object>
<int key="connectionID">567</int>
......@@ -4908,7 +4913,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_waves_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="663519093"/>
</object>
<int key="connectionID">568</int>
......@@ -4916,7 +4921,7 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_zoom_ckb</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="767337060"/>
</object>
<int key="connectionID">569</int>
......@@ -4924,7 +4929,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">addLogoModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="515591962"/>
</object>
<int key="connectionID">571</int>
......@@ -4932,7 +4937,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">addLogoModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="281324922"/>
</object>
<int key="connectionID">572</int>
......@@ -4940,7 +4945,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">addLogoModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="273610993"/>
</object>
<int key="connectionID">573</int>
......@@ -4948,7 +4953,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">addLogoModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="974397022"/>
</object>
<int key="connectionID">574</int>
......@@ -4956,7 +4961,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">addTextModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="341775592"/>
</object>
<int key="connectionID">575</int>
......@@ -4964,7 +4969,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">addTextModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="135717749"/>
</object>
<int key="connectionID">576</int>
......@@ -4972,7 +4977,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">adjustSliderChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="1033837370"/>
</object>
<int key="connectionID">577</int>
......@@ -4980,7 +4985,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">adjustSliderChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="714538558"/>
</object>
<int key="connectionID">578</int>
......@@ -4988,7 +4993,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">adjustSliderChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="376722054"/>
</object>
<int key="connectionID">579</int>
......@@ -4996,7 +5001,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">adjustSliderChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="665985520"/>
</object>
<int key="connectionID">580</int>
......@@ -5004,7 +5009,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">adjustSliderChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="760066178"/>
</object>
<int key="connectionID">581</int>
......@@ -5012,7 +5017,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">adjustSliderChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="248577800"/>
</object>
<int key="connectionID">582</int>
......@@ -5020,7 +5025,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">bandingSliderChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="484297776"/>
</object>
<int key="connectionID">583</int>
......@@ -5028,7 +5033,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">blurModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="148511149"/>
</object>
<int key="connectionID">584</int>
......@@ -5036,7 +5041,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">cloneModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="772228563"/>
</object>
<int key="connectionID">585</int>
......@@ -5044,7 +5049,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">cropFieldChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="411363183"/>
</object>
<int key="connectionID">586</int>
......@@ -5052,7 +5057,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">cropFieldChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="950709956"/>
</object>
<int key="connectionID">587</int>
......@@ -5060,7 +5065,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">cropFieldChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="190644777"/>
</object>
<int key="connectionID">588</int>
......@@ -5068,7 +5073,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">cropFieldChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="785525140"/>
</object>
<int key="connectionID">589</int>
......@@ -5076,7 +5081,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableAddLogo:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="851614399"/>
</object>
<int key="connectionID">590</int>
......@@ -5084,7 +5089,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableEraseLogo:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="659004942"/>
</object>
<int key="connectionID">591</int>
......@@ -5092,7 +5097,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableAddText:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="830324038"/>
</object>
<int key="connectionID">592</int>
......@@ -5100,7 +5105,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableClone:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="635659192"/>
</object>
<int key="connectionID">593</int>
......@@ -5108,7 +5113,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableAdjust:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="702049168"/>
</object>
<int key="connectionID">594</int>
......@@ -5116,7 +5121,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableAdjustBrightnessThreshold:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="372967191"/>
</object>
<int key="connectionID">595</int>
......@@ -5124,7 +5129,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableBanding:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="618355475"/>
</object>
<int key="connectionID">596</int>
......@@ -5132,7 +5137,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableBlur:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="232141445"/>
</object>
<int key="connectionID">597</int>
......@@ -5140,7 +5145,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableCropModifier:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="973277604"/>
</object>
<int key="connectionID">598</int>
......@@ -5148,7 +5153,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableCropModifier:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="447321799"/>
</object>
<int key="connectionID">599</int>
......@@ -5156,7 +5161,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableExtract:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="866370700"/>
</object>
<int key="connectionID">600</int>
......@@ -5164,7 +5169,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableGradient:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="726246058"/>
</object>
<int key="connectionID">601</int>
......@@ -5172,7 +5177,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableGrain:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="787792998"/>
</object>
<int key="connectionID">602</int>
......@@ -5180,7 +5185,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableInvert:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="699678759"/>
</object>
<int key="connectionID">603</int>
......@@ -5188,7 +5193,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableMotionDetect:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="679961475"/>
</object>
<int key="connectionID">604</int>
......@@ -5196,7 +5201,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableNoise:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="531092636"/>
</object>
<int key="connectionID">605</int>
......@@ -5204,7 +5209,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enablePosterize:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="677375378"/>
</object>
<int key="connectionID">606</int>
......@@ -5212,7 +5217,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enablePsychedelic:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="158304666"/>
</object>
<int key="connectionID">607</int>
......@@ -5220,7 +5225,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enablePuzzle:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="36160666"/>
</object>
<int key="connectionID">608</int>
......@@ -5228,7 +5233,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableSepia:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="317124105"/>
</object>
<int key="connectionID">609</int>
......@@ -5236,7 +5241,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableSharpen:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="828169901"/>
</object>
<int key="connectionID">610</int>
......@@ -5244,7 +5249,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableTransform:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="351076845"/>
</object>
<int key="connectionID">611</int>
......@@ -5252,7 +5257,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableThreshold:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="937239453"/>
</object>
<int key="connectionID">612</int>
......@@ -5260,7 +5265,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableWaterEffect:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="834758738"/>
</object>
<int key="connectionID">613</int>
......@@ -5268,7 +5273,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableWaves:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="663519093"/>
</object>
<int key="connectionID">614</int>
......@@ -5276,7 +5281,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableZoom:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="767337060"/>
</object>
<int key="connectionID">615</int>
......@@ -5284,7 +5289,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">eraseLogoModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="381763111"/>
</object>
<int key="connectionID">616</int>
......@@ -5292,7 +5297,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">eraseLogoModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="349672090"/>
</object>
<int key="connectionID">618</int>
......@@ -5300,7 +5305,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">eraseLogoModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="15696892"/>
</object>
<int key="connectionID">619</int>
......@@ -5308,7 +5313,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">extractModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="79386836"/>
</object>
<int key="connectionID">620</int>
......@@ -5316,7 +5321,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">gradientModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="856105297"/>
</object>
<int key="connectionID">621</int>
......@@ -5324,7 +5329,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">gradientModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="275724926"/>
</object>
<int key="connectionID">622</int>
......@@ -5332,7 +5337,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">gradientModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="121731822"/>
</object>
<int key="connectionID">623</int>
......@@ -5340,7 +5345,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">grainSliderChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="288762928"/>
</object>
<int key="connectionID">624</int>
......@@ -5348,7 +5353,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">posterizeModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="967949481"/>
</object>
<int key="connectionID">625</int>
......@@ -5356,7 +5361,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">puzzleModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="357710165"/>
</object>
<int key="connectionID">626</int>
......@@ -5364,7 +5369,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">puzzleModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="227755793"/>
</object>
<int key="connectionID">627</int>
......@@ -5372,7 +5377,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">puzzleModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="268273719"/>
</object>
<int key="connectionID">628</int>
......@@ -5380,7 +5385,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">sepiaModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="373866613"/>
</object>
<int key="connectionID">629</int>
......@@ -5388,7 +5393,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">sharpenSliderChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="75681829"/>
</object>
<int key="connectionID">630</int>
......@@ -5396,7 +5401,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">thresholdModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="1069462988"/>
</object>
<int key="connectionID">631</int>
......@@ -5404,7 +5409,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">thresholdModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="540871009"/>
</object>
<int key="connectionID">632</int>
......@@ -5412,7 +5417,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">thresholdModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="538371352"/>
</object>
<int key="connectionID">633</int>
......@@ -5420,11 +5425,19 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">transformModifierChanged:</string>
<reference key="source" ref="443700460"/>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="401651452"/>
</object>
<int key="connectionID">634</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_tableView</string>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="898819366"/>
</object>
<int key="connectionID">635</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
......@@ -6986,6 +6999,9 @@
<object class="IBObjectRecord">
<int key="objectID">294</int>
<reference key="object" ref="580154870"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="parent" ref="1069462988"/>
</object>
<object class="IBObjectRecord">
......@@ -7575,7 +7591,7 @@
</object>
<object class="IBObjectRecord">
<int key="objectID">472</int>
<reference key="object" ref="443700460"/>
<reference key="object" ref="707254443"/>
<reference key="parent" ref="0"/>
</object>
</object>
......@@ -8343,7 +8359,7 @@
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUEAAABCqgAAA</bytes>
<bytes key="NSTransformStruct">AUEAAABCtAAAA</bytes>
</object>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<object class="NSAffineTransform">
......@@ -8621,7 +8637,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUDAAABDHgAAA</bytes>
<bytes key="NSTransformStruct">AUEAAABBUAAAA</bytes>
</object>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<object class="NSAffineTransform">
......@@ -8769,7 +8785,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">634</int>
<int key="maxID">636</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
......@@ -9177,6 +9193,7 @@
<string>o_sharpen_ckb</string>
<string>o_sharpen_lbl</string>
<string>o_sharpen_sld</string>
<string>o_tableView</string>
<string>o_threshold_ckb</string>
<string>o_threshold_color_fld</string>
<string>o_threshold_color_lbl</string>
......@@ -9290,6 +9307,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
......@@ -9380,6 +9398,7 @@
<string>o_sharpen_ckb</string>
<string>o_sharpen_lbl</string>
<string>o_sharpen_sld</string>
<string>o_tableView</string>
<string>o_threshold_ckb</string>
<string>o_threshold_color_fld</string>
<string>o_threshold_color_lbl</string>
......@@ -9732,6 +9751,10 @@
<string key="name">o_sharpen_sld</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_tableView</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_threshold_ckb</string>
<string key="candidateClassName">id</string>
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ 3b66dabc
......@@ -44,7 +44,6 @@
CC402EEE0E00ABBB006A4BA4 /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCF358B9077F10BA007DB450 /* Preferences.nib */; };
CC402EEF0E00ABBB006A4BA4 /* Open.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCA693C10789DF8700139EC6 /* Open.nib */; };
CC402EF00E00ABBB006A4BA4 /* Wizard.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCFCCDB7085CE18F001E36AF /* Wizard.nib */; };
CC402EF10E00ABBB006A4BA4 /* Extended.nib in Resources */ = {isa = PBXBuildFile; fileRef = DC7F46EB08A183FC0027DB24 /* Extended.nib */; };
CC402EF20E00ABBB006A4BA4 /* Bookmarks.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */; };
CC402EF30E00ABBB006A4BA4 /* about_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = DCDA5E6408F94518009D93A8 /* about_bg.png */; };
CC402EF50E00ABBB006A4BA4 /* skip_forward_active_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A6FA0958A6E600018C74 /* skip_forward_active_embedded.png */; };
......@@ -394,9 +393,6 @@
CCF11B530F8BFB520088542D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/ErrorPanel.nib; sourceTree = "<group>"; };
DC769AB7085DF0DB001A838D /* wizard.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; name = wizard.m; path = ../../../modules/gui/macosx/wizard.m; sourceTree = SOURCE_ROOT; tabWidth = 4; usesTabs = 0; };
DC769AB8085DF0DB001A838D /* wizard.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = wizard.h; path = ../../../modules/gui/macosx/wizard.h; sourceTree = SOURCE_ROOT; };
DC7F46EC08A183FC0027DB24 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Extended.nib; sourceTree = "<group>"; };
DC7F46F008A187F60027DB24 /* extended.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 5; name = extended.h; path = ../../../modules/gui/macosx/extended.h; sourceTree = SOURCE_ROOT; usesTabs = 0; };
DC7F46F108A187F60027DB24 /* extended.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; includeInIndex = 0; name = extended.m; path = ../../../modules/gui/macosx/extended.m; sourceTree = SOURCE_ROOT; };
DCA00AA8075F948800E6BF46 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/About.nib; sourceTree = "<group>"; };
DCA693C20789DF8700139EC6 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Open.nib; sourceTree = "<group>"; };
DCDA5E6408F94518009D93A8 /* about_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = about_bg.png; path = Resources/about_bg.png; sourceTree = "<group>"; };
......@@ -508,8 +504,6 @@
8E9CA1A506D7DEE800B7186C /* voutgl.m */,
DC769AB8085DF0DB001A838D /* wizard.h */,
DC769AB7085DF0DB001A838D /* wizard.m */,
DC7F46F008A187F60027DB24 /* extended.h */,
DC7F46F108A187F60027DB24 /* extended.m */,
DCE7BD0708A5724D007B10AE /* bookmarks.h */,
DCE7BD0608A5724D007B10AE /* bookmarks.m */,
CC6D8D9C0A878DED006F2BBE /* AppleRemote.h */,
......@@ -807,7 +801,6 @@
DCF358B9077F10BA007DB450 /* Preferences.nib */,
DCA693C10789DF8700139EC6 /* Open.nib */,
DCFCCDB7085CE18F001E36AF /* Wizard.nib */,
DC7F46EB08A183FC0027DB24 /* Extended.nib */,
DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */,
CC5560261365CE4800D54038 /* AudioEffects.nib */,
CC707EC6137474A50003010A /* SyncTracks.nib */,
......@@ -938,7 +931,6 @@
CC402EEE0E00ABBB006A4BA4 /* Preferences.nib in Resources */,
CC402EEF0E00ABBB006A4BA4 /* Open.nib in Resources */,
CC402EF00E00ABBB006A4BA4 /* Wizard.nib in Resources */,
CC402EF10E00ABBB006A4BA4 /* Extended.nib in Resources */,
CC402EF20E00ABBB006A4BA4 /* Bookmarks.nib in Resources */,
CC402EF30E00ABBB006A4BA4 /* about_bg.png in Resources */,
CC402EF50E00ABBB006A4BA4 /* skip_forward_active_embedded.png in Resources */,
......@@ -1064,14 +1056,6 @@
name = ErrorPanel.nib;
sourceTree = "<group>";
};
DC7F46EB08A183FC0027DB24 /* Extended.nib */ = {
isa = PBXVariantGroup;
children = (
DC7F46EC08A183FC0027DB24 /* English */,
);
name = Extended.nib;
sourceTree = "<group>";
};
DCA00AA7075F948800E6BF46 /* About.nib */ = {
isa = PBXVariantGroup;
children = (
......
modules/gui/macosx/Modules.am
View file @ 3b66dabc
......@@ -41,8 +41,6 @@ SOURCES_macosx = \
output.m \
wizard.h \
wizard.m \
extended.h \
extended.m \
AudioEffects.h \
AudioEffects.m \
TrackSynchronization.h \
......
modules/gui/macosx/VideoEffects.h
View file @ 3b66dabc
......@@ -141,6 +141,7 @@
/* generic */
+ (VLCVideoEffects *)sharedInstance;
- (IBAction)toggleWindow:(id)sender;
- (void)resetValues;
- (void)setVideoFilter: (char *)psz_name on:(BOOL)b_on;
......
modules/gui/macosx/VideoEffects.m
View file @ 3b66dabc
......@@ -48,6 +48,14 @@ static VLCVideoEffects *_o_sharedInstance = nil;
return _o_sharedInstance;
}
- (IBAction)toggleWindow:(id)sender
{
if( [o_window isVisible] )
[o_window orderOut:sender];
else
[o_window makeKeyAndOrderFront:sender];
}
- (void)awakeFromNib
{
[o_window setTitle: _NS("Video Effects")];
......@@ -216,7 +224,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
[o_banding_sld setIntValue: config_GetInt( p_intf, "gradfun-radius" )];
[o_banding_sld setEnabled: [o_banding_ckb state]];
[o_grain_sld setFloatValue: config_GetFloat( p_intf, "grain-variance" )];
[o_grain_sld setEnabled: [o_grain_sld state]];
[o_grain_sld setEnabled: [o_grain_ckb state]];
[o_crop_top_fld setIntValue: 0];
[o_crop_left_fld setIntValue: 0];
......
modules/gui/macosx/extended.h deleted 100644 → 0
View file @ 68258909
/*****************************************************************************
* extended.h: MacOS X Extended interface panel
*****************************************************************************
* Copyright (C) 2005-2007 the VideoLAN team
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* VLCExtended
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "intf.h"
#import <vlc_common.h>
@interface VLCExtended : NSObject
{
/* views and window */
IBOutlet id o_adjustImg_view;
IBOutlet id o_audioFlts_view;
IBOutlet id o_videoFilters_view;
IBOutlet id o_extended_window;
/* window content */
IBOutlet id o_selector_pop;
IBOutlet id o_top_controls_box;
/* video filters */
IBOutlet id o_btn_vidFlts_mrInfo;
IBOutlet id o_ckb_blur;
IBOutlet id o_ckb_imgClone;
IBOutlet id o_ckb_imgCrop;
IBOutlet id o_ckb_imgInvers;
IBOutlet id o_ckb_trnsform;
IBOutlet id o_ckb_intZoom;
IBOutlet id o_ckb_wave;
IBOutlet id o_ckb_ripple;
IBOutlet id o_ckb_psycho;
IBOutlet id o_ckb_gradient;
IBOutlet id o_lbl_general;
IBOutlet id o_lbl_distort;
/* audio filters */
IBOutlet id o_ckb_vlme_norm;
IBOutlet id o_ckb_hdphnVirt;
IBOutlet id o_lbl_maxLevel;
IBOutlet id o_sld_maxLevel;
/* adjust image */
IBOutlet id o_btn_rstrDefaults;
IBOutlet id o_ckb_enblAdjustImg;
IBOutlet id o_lbl_brightness;
IBOutlet id o_lbl_contrast;
IBOutlet id o_lbl_gamma;
IBOutlet id o_lbl_hue;
IBOutlet id o_lbl_saturation;
IBOutlet id o_lbl_opaque;
IBOutlet id o_sld_brightness;
IBOutlet id o_sld_contrast;
IBOutlet id o_sld_gamma;
IBOutlet id o_sld_hue;
IBOutlet id o_sld_saturation;
IBOutlet id o_sld_opaque;
/* global variables */
NSView * o_currentlyshown_view;
}
- (IBAction)viewSelectorAction:(id)sender;
- (IBAction)enableAdjustImage:(id)sender;
- (IBAction)restoreDefaultsForAdjustImage:(id)sender;
- (IBAction)sliderActionAdjustImage:(id)sender;
- (IBAction)opaqueSliderAction:(id)sender;
- (IBAction)enableHeadphoneVirtualizer:(id)sender;
- (IBAction)sliderActionMaximumAudioLevel:(id)sender;
- (IBAction)enableVolumeNormalization:(id)sender;
- (IBAction)videoFilterAction:(id)sender;
- (IBAction)moreInfoVideoFilters:(id)sender;
+ (VLCExtended *)sharedInstance;
- (void)showPanel;
- (void)initStrings;
- (void)changeVoutFiltersString: (char *)psz_name onOrOff: (bool )b_add;
- (void)changeVideoFiltersString: (char *)psz_name onOrOff: (bool )b_add;
- (void)changeAFiltersString: (char *)psz_name onOrOff: (bool )b_add;
@end
modules/gui/macosx/extended.m deleted 100644 → 0
View file @ 68258909
/*****************************************************************************
* extended.m: MacOS X Extended interface panel
*****************************************************************************
* Copyright (C) 2005-2008 the VideoLAN team
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#import "extended.h"
#import "vout.h"
#import <vlc_aout.h>
#import <vlc_vout.h>
#import <vlc_interface.h>
#import <vlc_playlist.h>
/*****************************************************************************
* VLCExtended implementation
*****************************************************************************/
@implementation VLCExtended
static VLCExtended *_o_sharedInstance = nil;
+ (VLCExtended *)sharedInstance
{
return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
}
- (id)init
{
if (_o_sharedInstance) {
[self dealloc];
} else {
_o_sharedInstance = [super init];
}
return _o_sharedInstance;
}
/*****************************************************************************
* GUI methods
*****************************************************************************/
- (void)initStrings
{
/* localise GUI-strings */
/* method is called from intf.m (in method showExtended) */
[o_extended_window setTitle: _NS("Extended controls")];
[o_btn_vidFlts_mrInfo setToolTip: _NS("Shows more information about the available video filters.")];
[o_ckb_wave setTitle: _NS("Wave")];
[o_ckb_ripple setTitle: _NS("Ripple")];
[o_ckb_psycho setTitle: _NS("Psychedelic")];
[o_ckb_gradient setTitle: _NS("Gradient")];
[o_lbl_general setStringValue: _NS("General editing filters")];
[o_lbl_distort setStringValue: _NS("Distortion filters")];
[o_ckb_blur setTitle: _NS("Blur")];
[o_ckb_blur setToolTip: _NS("Adds motion blurring to the image")];
[o_ckb_imgClone setTitle: _NS("Image clone")];
[o_ckb_imgClone setToolTip: _NS("Creates several copies of the Video "
"output window" )];
[o_ckb_imgCrop setTitle: _NS("Image cropping")];
[o_ckb_imgCrop setToolTip: _NS("Crops a defined part of the image")];
[o_ckb_imgInvers setTitle: _NS("Invert colors")];
[o_ckb_imgInvers setToolTip: _NS("Inverts the colors of the image")];
[o_ckb_trnsform setTitle: _NS("Transformation")];
[o_ckb_trnsform setToolTip: _NS("Rotates or flips the image")];
[o_ckb_intZoom setTitle: _NS("Interactive Zoom")];
[o_ckb_intZoom setToolTip: _NS("Enables an interactive Zoom feature")];
[o_ckb_vlme_norm setTitle: _NS("Volume normalization")];
[o_ckb_vlme_norm setToolTip: _NS("Prevents the audio output from going "
"over a predefined value.")];
[o_ckb_hdphnVirt setTitle: _NS("Headphone virtualization")];
[o_ckb_hdphnVirt setToolTip: _NS("Imitates the effect of surround sound "
"when using headphones.")];
[o_lbl_maxLevel setStringValue: _NS("Maximum level")];
[o_btn_rstrDefaults setTitle: _NS("Restore Defaults")];
[o_ckb_enblAdjustImg setTitle: _NS("Enable")];
[o_lbl_brightness setStringValue: _NS("Brightness")];
[o_lbl_contrast setStringValue: _NS("Contrast")];
[o_lbl_gamma setStringValue: _NS("Gamma")];
[o_lbl_hue setStringValue: _NS("Hue")];
[o_lbl_saturation setStringValue: _NS("Saturation")];
[o_lbl_opaque setStringValue: _NS("Opaqueness")];
}
- (void)awakeFromNib
{
/* set the adjust-filter-sliders to the values from the prefs and enable
* them, if wanted */
char * psz_vfilters;
intf_thread_t *p_intf = VLCIntf;
psz_vfilters = config_GetPsz( p_intf, "vout-filter" );
/* set the video-filter-checkboxes to the correct values */
if( psz_vfilters )
{
[o_ckb_blur setState: (NSInteger)strstr( psz_vfilters, "motionblur")];
[o_ckb_imgClone setState: (NSInteger)strstr( psz_vfilters, "clone")];
[o_ckb_imgCrop setState: (NSInteger)strstr( psz_vfilters, "crop")];
[o_ckb_trnsform setState: (NSInteger)strstr( psz_vfilters, "transform")];
[o_ckb_intZoom setState: (NSInteger)strstr( psz_vfilters, "magnify")];
free( psz_vfilters );
}
/* set the video-filter checkboxes to the correct values */
char * psz_vifilters;
psz_vifilters = config_GetPsz( p_intf, "video-filter" );
if( psz_vifilters && strstr( psz_vifilters, "adjust" ) )
{
[o_ckb_enblAdjustImg setState: NSOnState];
[o_btn_rstrDefaults setEnabled: YES];
[o_sld_brightness setEnabled: YES];
[o_sld_contrast setEnabled: YES];
[o_sld_gamma setEnabled: YES];
[o_sld_hue setEnabled: YES];
[o_sld_saturation setEnabled: YES];
}
else
{
[o_ckb_enblAdjustImg setState: NSOffState];
[o_btn_rstrDefaults setEnabled: NO];
[o_sld_brightness setEnabled: NO];
[o_sld_contrast setEnabled: NO];
[o_sld_gamma setEnabled: NO];
[o_sld_hue setEnabled: NO];
[o_sld_saturation setEnabled: NO];
}
if( psz_vifilters )
{
[o_ckb_wave setState: (NSInteger)strstr( psz_vifilters, "wave")];
[o_ckb_psycho setState: (NSInteger)strstr( psz_vifilters, "psychedelic")];
[o_ckb_ripple setState: (NSInteger)strstr( psz_vifilters, "ripple")];
[o_ckb_gradient setState: (NSInteger)strstr( psz_vifilters, "gradient")];
[o_ckb_imgInvers setState: (NSInteger)strstr( psz_vifilters, "invert")];
free( psz_vifilters );
}
/* set the audio-filter-checkboxes to the values taken from the prefs */
char * psz_afilters;
psz_afilters = config_GetPsz( p_intf, "audio-filter" );
if( psz_afilters )
{
[o_ckb_hdphnVirt setState: (NSInteger)strstr( psz_afilters, "headphone" ) ];
[o_ckb_vlme_norm setState: (NSInteger)strstr( psz_afilters, "normvol" ) ];
free( psz_afilters );
}
/* fill the popup button according to our available views */
[o_selector_pop removeAllItems];
[o_selector_pop addItemWithTitle: _NS("Adjust Image")];
[o_selector_pop addItemWithTitle: _NS("Video Filter")];
[o_selector_pop addItemWithTitle: _NS("Audio Filter")];
[o_selector_pop selectItemAtIndex: 0];
/* make sure we draw a view on launch */
[self viewSelectorAction: self];
[self initStrings];
}
- (void)showPanel
{
/* get the correct slider values from the prefs, in case they were changed
* elsewhere */
intf_thread_t * p_intf = VLCIntf;
int i_value = config_GetInt( p_intf, "hue" );
if( i_value > 0 && i_value < 360 )
{
[o_sld_hue setIntValue: i_value];
}
float f_value;
f_value = config_GetFloat( p_intf, "saturation" );
if( f_value > 0 && f_value < 5 )
[o_sld_saturation setIntValue: (int)(100 * f_value) ];
f_value = config_GetFloat( p_intf, "contrast" );
if( f_value > 0 && f_value < 4 )
[o_sld_contrast setIntValue: (int)(100 * f_value) ];
f_value = config_GetFloat( p_intf, "brightness" );
if( f_value > 0 && f_value < 2 )
[o_sld_brightness setIntValue: (int)(100 * f_value) ];
f_value = config_GetFloat( p_intf, "gamma" );
if( f_value > 0 && f_value < 10 )
[o_sld_gamma setIntValue: (int)(10 * f_value) ];
f_value = config_GetFloat( p_intf, "norm-max-level" );
if( f_value > 0 && f_value < 10 )
[o_sld_maxLevel setFloatValue: f_value ];
[o_sld_opaque setFloatValue: (config_GetFloat( p_intf,
"macosx-opaqueness") * 100)];
/* show the window */
[o_extended_window displayIfNeeded];
[o_extended_window makeKeyAndOrderFront:nil];
}
- (IBAction)viewSelectorAction:(id)sender
{
NSView *o_toBeShown_view;
/* check which view to show */
if( [[[o_selector_pop selectedItem] title] isEqualToString: _NS("Adjust Image")] )
o_toBeShown_view = o_adjustImg_view;
else if( [[[o_selector_pop selectedItem] title] isEqualToString: _NS("Audio Filter")] )
o_toBeShown_view = o_audioFlts_view;
else if( [[[o_selector_pop selectedItem] title] isEqualToString: _NS("Video Filter")] )
o_toBeShown_view = o_videoFilters_view;
else
msg_Err( VLCIntf, "invalid ui view requested" );
NSRect o_win_rect, o_view_rect, o_old_view_rect;
o_win_rect = [o_extended_window frame];
o_view_rect = [o_toBeShown_view frame];
if( o_currentlyshown_view != nil )
{
/* restore our window's height, if we've shown another category previously */
o_old_view_rect = [o_currentlyshown_view frame];
o_win_rect.size.height = o_win_rect.size.height - o_old_view_rect.size.height;
o_win_rect.origin.y = ( o_win_rect.origin.y + o_old_view_rect.size.height ) - o_view_rect.size.height;
/* remove our previous category view */
[o_currentlyshown_view removeFromSuperviewWithoutNeedingDisplay];
}
o_win_rect.size.height = o_win_rect.size.height + o_view_rect.size.height;
//[o_extended_window displayIfNeeded];
[o_extended_window setFrame: o_win_rect display:YES animate: YES];
[o_toBeShown_view setFrame: NSMakeRect( 0,
0, //[o_top_controls_box frame].size.height,
o_view_rect.size.width,
o_view_rect.size.height )];
[o_toBeShown_view setNeedsDisplay: YES];
[o_toBeShown_view setAutoresizesSubviews: YES];
[[o_extended_window contentView] addSubview: o_toBeShown_view];
/* keep our current category for further reference */
[o_currentlyshown_view release];
o_currentlyshown_view = o_toBeShown_view;
[o_currentlyshown_view retain];
}
- (IBAction)enableAdjustImage:(id)sender
{
/* en-/disable the sliders */
if ([o_ckb_enblAdjustImg state] == NSOnState)
{
[o_btn_rstrDefaults setEnabled: YES];
[o_sld_brightness setEnabled: YES];
[o_sld_contrast setEnabled: YES];
[o_sld_gamma setEnabled: YES];
[o_sld_hue setEnabled: YES];
[o_sld_saturation setEnabled: YES];
[self changeVideoFiltersString: "adjust" onOrOff: true];
}
else
{
[o_btn_rstrDefaults setEnabled: NO];
[o_sld_brightness setEnabled: NO];
[o_sld_contrast setEnabled: NO];
[o_sld_gamma setEnabled: NO];
[o_sld_hue setEnabled: NO];
[o_sld_saturation setEnabled: NO];
[self changeVideoFiltersString: "adjust" onOrOff: false];
}
}
- (IBAction)restoreDefaultsForAdjustImage:(id)sender
{
/* reset the sliders */
[o_sld_brightness setIntValue: 100];
[o_sld_contrast setIntValue: 100];
[o_sld_gamma setIntValue: 10];
[o_sld_hue setIntValue: 0];
[o_sld_saturation setIntValue: 100];
[o_sld_opaque setIntValue: 100];
/* transmit the values */
[self sliderActionAdjustImage: o_sld_brightness];
[self sliderActionAdjustImage: o_sld_contrast];
[self sliderActionAdjustImage: o_sld_gamma];
[self sliderActionAdjustImage: o_sld_hue];
[self sliderActionAdjustImage: o_sld_saturation];
[self opaqueSliderAction: o_sld_opaque];
}
- (IBAction)sliderActionAdjustImage:(id)sender
{
/* read-out the sliders' values and apply them */
intf_thread_t * p_intf = VLCIntf;
vout_thread_t *p_vout = getVout();
vlc_object_t *p_filter;
if( p_vout == NULL )
{
msg_Dbg( p_intf, "no vout present, saving settings anyway" );
if (sender == o_sld_brightness)
{
config_PutFloat( p_intf , "brightness" , [o_sld_brightness floatValue] / 100);
}
else if (sender == o_sld_contrast)
{
config_PutFloat( p_intf , "contrast" , [o_sld_contrast floatValue] / 100);
}
else if (sender == o_sld_gamma)
{
config_PutFloat( p_intf , "gamma" , [o_sld_gamma floatValue] / 10);
}
else if (sender == o_sld_hue)
{
config_PutInt( p_intf , "hue" , [o_sld_hue intValue]);
}
else if (sender == o_sld_saturation)
{
config_PutFloat( p_intf , "saturation" , [o_sld_saturation floatValue] / 100);
}
else
{
msg_Warn( p_intf, "the corresponding subsource coundn't be found" );
}
}
else
{
msg_Dbg( p_intf, "we found a vout to adjust, let's look for the filter" );
p_filter = vlc_object_find_name( pl_Get(p_intf), "adjust" );
if(! p_filter )
{
msg_Err( p_intf, "we're unable to find the adjust filter!" );
vlc_object_release( p_vout );
return;
}
if (sender == o_sld_brightness)
{
var_SetFloat( p_filter, "brightness", [o_sld_brightness floatValue] / 100 );
config_PutFloat( p_intf, "brightness", [o_sld_brightness floatValue] / 100 );
}
else if (sender == o_sld_contrast)
{
var_SetFloat( p_filter, "contrast", [o_sld_contrast floatValue] / 100 );
config_PutFloat( p_intf, "contrast", [o_sld_contrast floatValue] / 100 );
}
else if (sender == o_sld_gamma)
{
var_SetFloat( p_filter, "gamma", [o_sld_gamma floatValue] / 10 );
config_PutFloat( p_intf, "gamma", [o_sld_gamma floatValue] / 10 );
}
else if (sender == o_sld_hue)
{
var_SetInteger( p_filter, "hue", [o_sld_hue intValue] );
config_PutInt( p_intf , "hue" , [o_sld_hue intValue] );
}
else if (sender == o_sld_saturation)
{
var_SetFloat( p_filter, "saturation", [o_sld_saturation floatValue] / 100 );
config_PutFloat( p_intf , "saturation" , [o_sld_saturation floatValue] / 100 );
}
else
{
msg_Warn( p_intf, "couldn't find variable for slider!" );
}
vlc_object_release( p_filter );
vlc_object_release( p_vout );
}
}
/* change the opaqueness of the vouts */
- (IBAction)opaqueSliderAction:(id)sender
{
vlc_value_t val;
id o_window = [NSApp keyWindow];
NSArray *o_windows = [NSApp orderedWindows];
NSEnumerator *o_enumerator = [o_windows objectEnumerator];
playlist_t * p_playlist = pl_Get( VLCIntf );
vout_thread_t *p_vout = getVout();
vout_thread_t *p_real_vout;
val.f_float = [o_sld_opaque floatValue] / 100;
#if 0
if( p_vout != NULL )
{
p_real_vout = [VLCVoutView realVout: p_vout];
var_Set( p_real_vout, "macosx-opaqueness", val );
while ((o_window = [o_enumerator nextObject]))
{
if( [[o_window className] isEqualToString: @"VLCVoutWindow"] ||
[[[VLCMain sharedInstance] embeddedList]
windowContainsEmbedded: o_window])
{
[o_window setAlphaValue: val.f_float];
}
break;
}
vlc_object_release( p_vout );
}
#endif
/* store to prefs */
config_PutFloat( p_playlist , "macosx-opaqueness" , val.f_float );
}
- (IBAction)enableHeadphoneVirtualizer:(id)sender
{
/* en-/disable headphone virtualisation */
if ([o_ckb_hdphnVirt state] == NSOnState)
[self changeAFiltersString: "headphone_channel_mixer" onOrOff: true ];
else
[self changeAFiltersString: "headphone_channel_mixer" onOrOff: false ];
}
- (IBAction)sliderActionMaximumAudioLevel:(id)sender
{
/* read-out the slider's value and apply it */
intf_thread_t * p_intf = VLCIntf;
aout_instance_t * p_aout= getAout();
if( p_aout != NULL )
{
var_SetFloat( p_aout, "norm-max-level", [o_sld_maxLevel floatValue] );
vlc_object_release( p_aout );
}
config_PutFloat( p_intf, "norm-max-level", [o_sld_maxLevel floatValue] );
}
- (IBAction)enableVolumeNormalization:(id)sender
{
/* en-/disable volume normalisation */
if( [o_ckb_vlme_norm state] == NSOnState )
[self changeAFiltersString: "normvol" onOrOff: YES ];
else
[self changeAFiltersString: "normvol" onOrOff: NO ];
}
- (IBAction)videoFilterAction:(id)sender
{
/* en-/disable video filters */
if (sender == o_ckb_blur)
[self changeVideoFiltersString: "motionblur" onOrOff: [o_ckb_blur state]];
else if (sender == o_ckb_imgClone)
[self changeVoutFiltersString: "clone" onOrOff: [o_ckb_imgClone state]];
else if (sender == o_ckb_imgCrop)
[self changeVoutFiltersString: "crop" onOrOff: [o_ckb_imgCrop state]];
else if (sender == o_ckb_imgInvers)
[self changeVideoFiltersString: "invert" onOrOff: [o_ckb_imgInvers state]];
else if (sender == o_ckb_trnsform)
[self changeVoutFiltersString: "transform" onOrOff: [o_ckb_trnsform state]];
else if (sender == o_ckb_intZoom )
[self changeVoutFiltersString: "magnify" onOrOff: [o_ckb_intZoom state]];
else if (sender == o_ckb_wave )
[self changeVideoFiltersString: "wave" onOrOff: [o_ckb_wave state]];
else if (sender == o_ckb_gradient )
[self changeVideoFiltersString: "gradient" onOrOff: [o_ckb_gradient state]];
else if (sender == o_ckb_psycho )
[self changeVideoFiltersString: "psychedelic" onOrOff: [o_ckb_psycho state]];
else if (sender == o_ckb_ripple )
[self changeVideoFiltersString: "ripple" onOrOff: [o_ckb_ripple state]];
else
msg_Err( VLCIntf, "cannot find switched video-filter" ); /* this can't happen */
}
- (IBAction)moreInfoVideoFilters:(id)sender
{
/* show info sheet */
NSBeginInformationalAlertSheet(_NS("About the video filters"),
_NS("OK"),
@"",
@"",
o_extended_window,
nil,
nil,
nil,
nil,
_NS("This panel allows on-the-fly selection of various video effects.\n"
"These filters can be configured individually in the Preferences, in "
"the subsections of Video/Filters.\n"
"To choose the order in which the filter are applied, a filter "
"option string can be set in the Preferences, Video / Filters section."));
}
/*****************************************************************************
* methods to communicate changes to VLC's core
*****************************************************************************/
- (void)changeVoutFiltersString:(char *)psz_name onOrOff:(bool )b_add
{
/* copied from ../wxwidgets/extrapanel.cpp
* renamed to conform with Cocoa's rules */
/* this method only changes 1st generation video filters (the ones that
* can't be used for transcoding). Have a look at changeVideoFiltersString
* for the 2nd generation filters. */
vout_thread_t *p_vout;
intf_thread_t * p_intf = VLCIntf;
char *psz_parser, *psz_string;
psz_string = config_GetPsz( p_intf, "vout-filter" );
if( !psz_string ) psz_string = strdup("");
psz_parser = strstr( psz_string, psz_name );
if( b_add )
{
if( !psz_parser )
{
psz_parser = psz_string;
asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s",
psz_string, psz_name );
free( psz_parser );
}
else
{
return;
}
}
else
{
if( psz_parser )
{
memmove( psz_parser, psz_parser + strlen(psz_name) +
(*(psz_parser + strlen(psz_name)) == ':' ? 1 : 0 ),
strlen(psz_parser + strlen(psz_name)) + 1 );
/* Remove trailing : : */
if( *(psz_string+strlen(psz_string ) -1 ) == ':' )
{
*(psz_string+strlen(psz_string ) -1 ) = '\0';
}
}
else
{
free( psz_string );
return;
}
}
/* Vout is not kept, so put that in the config */
config_PutPsz( p_intf, "vout-filter", psz_string );
/* Try to set on the fly */
p_vout = getVout();
if( p_vout )
{
var_SetString( p_vout, "vout-filter", psz_string );
vlc_object_release( p_vout );
}
free( psz_string );
}
- (void)changeVideoFiltersString:(char *)psz_name onOrOff:(bool )b_add
{
/* same as changeVoutFiltersString but addressing the "video-filter"
* variable which represents the video filter 2 modules */
vout_thread_t *p_vout;
intf_thread_t * p_intf = VLCIntf;
char *psz_parser, *psz_string;
psz_string = config_GetPsz( p_intf, "video-filter" );
if( !psz_string ) psz_string = strdup("");
psz_parser = strstr( psz_string, psz_name );
if( b_add )
{
if( !psz_parser )
{
psz_parser = psz_string;
asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s",
psz_string, psz_name );
free( psz_parser );
}
else
{
return;
}
}
else
{
if( psz_parser )
{
memmove( psz_parser, psz_parser + strlen(psz_name) +
(*(psz_parser + strlen(psz_name)) == ':' ? 1 : 0 ),
strlen(psz_parser + strlen(psz_name)) + 1 );
/* Remove trailing : : */
if( *(psz_string+strlen(psz_string ) -1 ) == ':' )
{
*(psz_string+strlen(psz_string ) -1 ) = '\0';
}
}
else
{
free( psz_string );
return;
}
}
/* Vout is not kept, so put that in the config */
config_PutPsz( p_intf, "video-filter", psz_string );
/* Try to set on the fly */
p_vout = getVout();
if( p_vout )
{
var_SetString( p_vout, "video-filter", psz_string );
vlc_object_release( p_vout );
}
free( psz_string );
}
- (void)changeAFiltersString: (char *)psz_name onOrOff: (bool )b_add;
{
/* copied from ../wxwidgets/extrapanel.cpp
* renamed to conform with Cocoa's rules */
char *psz_parser, *psz_string;
intf_thread_t * p_intf = VLCIntf;
aout_instance_t * p_aout = getAout();
if( p_aout )
{
psz_string = var_GetNonEmptyString( p_aout, "audio-filter" );
}
else
{
psz_string = config_GetPsz( p_intf, "audio-filter" );
}
if( !psz_string ) psz_string = strdup("");
psz_parser = strstr( psz_string, psz_name );
if( b_add )
{
if( !psz_parser )
{
psz_parser = psz_string;
asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s",
psz_string, psz_name );
free( psz_parser );
}
else
{
if( p_aout ) vlc_object_release( p_aout );
return;
}
}
else
{
if( psz_parser )
{
memmove( psz_parser, psz_parser + strlen(psz_name) +
(*(psz_parser + strlen(psz_name)) == ':' ? 1 : 0 ),
strlen(psz_parser + strlen(psz_name)) + 1 );
if( *(psz_string+strlen(psz_string ) -1 ) == ':' )
{
*(psz_string+strlen(psz_string ) -1 ) = '\0';
}
}
else
{
free( psz_string );
if( p_aout ) vlc_object_release( p_aout );
return;
}
}
if( p_aout == NULL )
{
config_PutPsz( p_intf, "audio-filter", psz_string );
}
else
{
aout_EnableFilter( pl_Get( p_intf ), psz_string, b_add );
}
free( psz_string );
}
@end
modules/gui/macosx/intf.h
View file @ 3b66dabc
......@@ -105,7 +105,7 @@ struct intf_sys_t
id o_about; /* VLAboutBox */
id o_open; /* VLCOpen */
id o_wizard; /* VLCWizard */
id o_extended; /* VLCExtended */
id o_videoeffects; /* VLCVideoEffects */
id o_bookmarks; /* VLCBookmarks */
id o_embedded_list; /* VLCEmbeddedList*/
id o_coredialogs; /* VLCCoreDialogProvider */
......@@ -117,13 +117,13 @@ struct intf_sys_t
BOOL nib_open_loaded; /* open nibfile */
BOOL nib_about_loaded; /* about nibfile */
BOOL nib_wizard_loaded; /* wizard nibfile */
BOOL nib_extended_loaded; /* extended nibfile */
BOOL nib_bookmarks_loaded; /* bookmarks nibfile */
BOOL nib_prefs_loaded; /* preferences nibfile */
BOOL nib_info_loaded; /* information panel nibfile */
BOOL nib_coredialogs_loaded; /* CoreDialogs nibfile */
BOOL nib_audioeffects_loaded; /* audio effects panel */
BOOL nib_tracksynchro_loaded; /* track synchro panel */
BOOL nib_videoeffects_loaded; /* video effects panel */
IBOutlet VLCControllerWindow * o_window; /* main window */
IBOutlet NSView * o_playlist_view; /* playlist view */
......@@ -284,7 +284,7 @@ struct intf_sys_t
IBOutlet NSMenuItem * o_mi_player;
IBOutlet NSMenuItem * o_mi_controller;
IBOutlet NSMenuItem * o_mi_audioeffects;
IBOutlet NSMenuItem * o_mi_extended;
IBOutlet NSMenuItem * o_mi_videoeffects;
IBOutlet NSMenuItem * o_mi_bookmarks;
IBOutlet NSMenuItem * o_mi_playlist;
IBOutlet NSMenuItem * o_mi_info;
......@@ -407,7 +407,7 @@ struct intf_sys_t
- (IBAction)intfOpenCapture:(id)sender;
- (IBAction)showWizard:(id)sender;
- (IBAction)showExtended:(id)sender;
- (IBAction)showVideoEffects:(id)sender;
- (IBAction)showAudioEffects:(id)sender;
- (IBAction)showTrackSynchronization:(id)sender;
- (IBAction)showBookmarks:(id)sender;
......
modules/gui/macosx/intf.m
View file @ 3b66dabc
......@@ -47,7 +47,6 @@
#import "about.h"
#import "open.h"
#import "wizard.h"
#import "extended.h"
#import "bookmarks.h"
#import "coredialogs.h"
#import "embeddedwindow.h"
......@@ -55,6 +54,7 @@
#import "eyetv.h"
#import "simple_prefs.h"
#import "AudioEffects.h"
#import "VideoEffects.h"
#import "TrackSynchronization.h"
#import <AddressBook/AddressBook.h> /* for crashlog send mechanism */
......@@ -345,7 +345,6 @@ static VLCMain *_o_sharedMainInstance = nil;
o_prefs = nil;
o_open = [[VLCOpen alloc] init];
o_wizard = [[VLCWizard alloc] init];
o_extended = nil;
o_bookmarks = [[VLCBookmarks alloc] init];
//o_embedded_list = [[VLCEmbeddedList alloc] init];
o_coredialogs = [[VLCCoreDialogProvider alloc] init];
......@@ -714,7 +713,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_mi_player setTitle: _NS("Player...")];
[o_mi_controller setTitle: _NS("Controller...")];
[o_mi_audioeffects setTitle: _NS("Audio Effects...")];
[o_mi_extended setTitle: _NS("Extended Controls...")];
[o_mi_videoeffects setTitle: _NS("Video Filters...")];
[o_mi_bookmarks setTitle: _NS("Bookmarks...")];
[o_mi_playlist setTitle: _NS("Playlist...")];
[o_mi_info setTitle: _NS("Media Information...")];
......@@ -838,8 +837,8 @@ static VLCMain *_o_sharedMainInstance = nil;
if( nib_open_loaded )
[o_open release];
if( nib_extended_loaded )
[o_extended release];
if( nib_videoeffects_loaded )
[o_videoeffects release];
if (nib_audioeffects_loaded)
[o_audioeffects release];
......@@ -2235,15 +2234,15 @@ end:
}
}
- (IBAction)showExtended:(id)sender
- (IBAction)showVideoEffects:(id)sender
{
if( o_extended == nil )
o_extended = [[VLCExtended alloc] init];
if( o_videoeffects == nil )
o_videoeffects = [[VLCVideoEffects alloc] init];
if( !nib_extended_loaded )
nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner: NSApp];
if( !nib_videoeffects_loaded )
nib_videoeffects_loaded = [NSBundle loadNibNamed:@"VideoEffects" owner: NSApp];
[o_extended showPanel];
[o_videoeffects toggleWindow:sender];
}
- (IBAction)showTrackSynchronization:(id)sender
......
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