Commit 5fbd35fc authored by Felix Paul Kühne's avatar Felix Paul Kühne

remove over-engineered crop feature and reduce the number of choices for...

remove over-engineered crop feature and reduce the number of choices for aspect ratio changes to a reasonable set (close #8670)
parent c2507947
......@@ -21,8 +21,6 @@
UIActionSheet *_audiotrackActionSheet;
float _currentPlaybackRate;
NSArray *_cropRatios;
NSUInteger _currentCropMask;
NSArray *_aspectRatios;
NSUInteger _currentAspectRatioMask;
......@@ -66,7 +64,6 @@
@property (nonatomic, strong) IBOutlet UILabel *playbackSpeedLabel;
@property (nonatomic, strong) IBOutlet UILabel *playbackSpeedIndicator;
@property (nonatomic, strong) IBOutlet UIButton *aspectRatioButton;
@property (nonatomic, strong) IBOutlet UIButton *cropButton;
@property (nonatomic, strong) MLFile *mediaItem;
@property (nonatomic, strong) NSURL *url;
......
......@@ -81,8 +81,7 @@
recognizer.delegate = self;
[self.view addGestureRecognizer:recognizer];
_cropRatios = @[@"Default", @"16:10", @"16:9", @"2:39:1", @"5:3", @"4:3", @"5:4", @"1:1"];
_aspectRatios = @[@"Default", @"1:1", @"4:3", @"16:9", @"16:10", @"2.21:1", @"2:35:1", @"2.39:1", @"5:4"];
_aspectRatios = @[@"Default", @"4:3", @"16:9", @"16:10", @"2.21:1"];
}
- (void)viewWillAppear:(BOOL)animated
......@@ -164,8 +163,8 @@
self.playbackSpeedSlider.value = [self _playbackSpeed];
[self _updatePlaybackSpeedIndicator];
_currentAspectRatioMask = _currentCropMask = 0;
_mediaPlayer.videoAspectRatio = _mediaPlayer.videoCropGeometry = NULL;
_currentAspectRatioMask = 0;
_mediaPlayer.videoAspectRatio = NULL;
[self resetIdleTimer];
}
......@@ -260,8 +259,6 @@
_playbackSpeedButton.hidden = NO;
_videoFilterButton.alpha = 0.0f;
_videoFilterButton.hidden = NO;
_cropButton.alpha = 0.0f;
_cropButton.hidden = NO;
_aspectRatioButton.alpha = 0.0f;
_aspectRatioButton.hidden = NO;
}
......@@ -274,7 +271,6 @@
_playbackSpeedView.alpha = alpha;
_playbackSpeedButton.alpha = alpha;
_videoFilterButton.alpha = alpha;
_cropButton.alpha = alpha;
_aspectRatioButton.alpha = alpha;
};
......@@ -283,13 +279,11 @@
_controllerPanel.hidden = _controlsHidden;
_playbackSpeedButton.hidden = _controlsHidden;
_videoFilterButton.hidden = _controlsHidden;
_cropButton.hidden = _controlsHidden;
_aspectRatioButton.hidden = _controlsHidden;
} else {
_controllerPanel.hidden = NO;
_playbackSpeedButton.hidden = NO;
_videoFilterButton.hidden = NO;
_cropButton.hidden = NO;
_aspectRatioButton.hidden = NO;
}
_toolbar.hidden = _controlsHidden;
......@@ -531,18 +525,6 @@
_mediaPlayer.videoAspectRatio = (char *)[_aspectRatios[_currentAspectRatioMask] UTF8String];
[self.statusLabel showStatusMessage:[NSString stringWithFormat:NSLocalizedString(@"AR_CHANGED", @""), _aspectRatios[_currentAspectRatioMask]]];
}
} else if (sender == self.cropButton) {
NSUInteger count = [_cropRatios count];
if (_currentCropMask + 1 > count - 1) {
_mediaPlayer.videoCropGeometry = NULL;
_currentCropMask = 0;
[self.statusLabel showStatusMessage:[NSString stringWithFormat:NSLocalizedString(@"CROP_CHANGED", @""), NSLocalizedString(@"DEFAULT", @"")]];
} else {
_currentCropMask++;
_mediaPlayer.videoCropGeometry = (char *)[_cropRatios[_currentCropMask] UTF8String];
[self.statusLabel showStatusMessage:[NSString stringWithFormat:NSLocalizedString(@"CROP_CHANGED", @""), _cropRatios[_currentCropMask]]];
}
}
}
......
......@@ -496,31 +496,6 @@
<reference key="IBUIFontDescription" ref="581809469"/>
<reference key="IBUIFont" ref="560717679"/>
</object>
<object class="IBUIButton" id="420106525">
<reference key="NSNextResponder" ref="647120888"/>
<int key="NSvFlags">300</int>
<string key="NSFrame">{{20, 533}, {45, 44}}</string>
<reference key="NSSuperview" ref="647120888"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="753155309"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIHighlightedTitleColor" ref="33107367"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="25335422"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">aspectratio.png</string>
</object>
<reference key="IBUIFontDescription" ref="581809469"/>
<reference key="IBUIFont" ref="560717679"/>
</object>
<object class="IBUIView" id="11334779">
<reference key="NSNextResponder" ref="647120888"/>
<int key="NSvFlags">297</int>
......@@ -794,7 +769,7 @@
<string key="NSFrame">{{20, 5}, {280, 21}}</string>
<reference key="NSSuperview" ref="567155588"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="420106525"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
......@@ -1120,22 +1095,6 @@
</object>
<int key="connectionID">197</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">aspectRatioButton</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="420106525"/>
</object>
<int key="connectionID">202</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">cropButton</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="458325731"/>
</object>
<int key="connectionID">204</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">statusLabel</string>
......@@ -1160,6 +1119,14 @@
</object>
<int key="connectionID">224</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">aspectRatioButton</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="458325731"/>
</object>
<int key="connectionID">229</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">closePlayback:</string>
......@@ -1303,15 +1270,6 @@
</object>
<int key="connectionID">203</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">videoDimensionAction:</string>
<reference key="source" ref="420106525"/>
<reference key="destination" ref="841351856"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">201</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">positionSliderAction:</string>
......@@ -1354,7 +1312,6 @@
<reference ref="567155588"/>
<reference ref="959094125"/>
<reference ref="458325731"/>
<reference ref="420106525"/>
<reference ref="145877143"/>
</array>
<reference key="parent" ref="0"/>
......@@ -1521,11 +1478,6 @@
<reference key="object" ref="458325731"/>
<reference key="parent" ref="647120888"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">199</int>
<reference key="object" ref="420106525"/>
<reference key="parent" ref="647120888"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">205</int>
<reference key="object" ref="145877143"/>
......@@ -1643,7 +1595,6 @@
<string key="181.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="182.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="198.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="199.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="205.CustomClassName">VLCStatusLabel</string>
<string key="205.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="218.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
......@@ -1659,7 +1610,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">228</int>
<int key="maxID">229</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
......@@ -1743,7 +1694,6 @@
<string key="contrastLabel">UILabel</string>
<string key="contrastSlider">UISlider</string>
<string key="controllerPanel">UIView</string>
<string key="cropButton">UIButton</string>
<string key="fwdButton">UIButton</string>
<string key="gammaLabel">UILabel</string>
<string key="gammaSlider">UISlider</string>
......@@ -1807,10 +1757,6 @@
<string key="name">controllerPanel</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="cropButton">
<string key="name">cropButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="fwdButton">
<string key="name">fwdButton</string>
<string key="candidateClassName">UIButton</string>
......@@ -1937,7 +1883,6 @@
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="PlayingExternally~ipad.png">{261, 195}</string>
<string key="aspectratio.png">{40, 24}</string>
<string key="audio.png">{66, 66}</string>
<string key="backward.png">{100, 66}</string>
<string key="crop.png">{24, 24}</string>
......
......@@ -46,6 +46,7 @@
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrameSize">{320, 568}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="831191623"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor" id="597987587">
......@@ -63,6 +64,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrameSize">{320, 83}</string>
<reference key="NSSuperview" ref="644225698"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1041366711"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
......@@ -77,6 +79,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{190, 20}, {54, 44}}</string>
<reference key="NSSuperview" ref="644225698"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="649952457"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor" id="119528819">
......@@ -118,6 +121,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{74, 20}, {56, 44}}</string>
<reference key="NSSuperview" ref="644225698"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="58725604"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="119528819"/>
......@@ -143,6 +147,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{138, 20}, {44, 44}}</string>
<reference key="NSSuperview" ref="644225698"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="133336185"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="119528819"/>
......@@ -168,6 +173,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{22, 20}, {44, 44}}</string>
<reference key="NSSuperview" ref="644225698"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="722825395"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="119528819"/>
......@@ -193,6 +199,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{252, 20}, {44, 44}}</string>
<reference key="NSSuperview" ref="644225698"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="119528819"/>
<bool key="IBUIOpaque">NO</bool>
......@@ -215,6 +222,7 @@
</array>
<string key="NSFrame">{{0, 450}, {320, 83}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="542483262"/>
<string key="NSReuseIdentifierKey">_NS:10</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
......@@ -228,6 +236,7 @@
<int key="NSvFlags">293</int>
<string key="NSFrame">{{80, 20}, {160, 130}}</string>
<reference key="NSSuperview" ref="731041733"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="529141063"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
......@@ -242,6 +251,7 @@
<int key="NSvFlags">293</int>
<string key="NSFrame">{{20, 170}, {280, 21}}</string>
<reference key="NSSuperview" ref="731041733"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="360323160"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="119528819"/>
......@@ -274,6 +284,7 @@
<int key="NSvFlags">293</int>
<string key="NSFrame">{{20, 199}, {289, 53}}</string>
<reference key="NSSuperview" ref="731041733"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="295483080"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="119528819"/>
......@@ -309,6 +320,7 @@
</array>
<string key="NSFrame">{{0, 135}, {320, 257}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="510494963"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="119528819"/>
......@@ -328,6 +340,7 @@
<int key="NSvFlags">290</int>
<string key="NSFrame">{{0, 5}, {201, 23}}</string>
<reference key="NSSuperview" ref="685682846"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="487467547"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSHuggingPriority">{250, 250}</string>
......@@ -345,6 +358,7 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{203, 5}, {46, 21}}</string>
<reference key="NSSuperview" ref="685682846"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="331977945"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -374,6 +388,7 @@
</array>
<string key="NSFrame">{{66, 6}, {260, 33}}</string>
<reference key="NSSuperview" ref="831191623"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="402268973"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="119528819"/>
......@@ -382,6 +397,7 @@
</array>
<string key="NSFrame">{{0, 20}, {320, 44}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="685682846"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -413,6 +429,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{18, 19}, {284, 23}}</string>
<reference key="NSSuperview" ref="331977945"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="656806791"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -427,6 +444,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 5}, {280, 21}}</string>
<reference key="NSSuperview" ref="331977945"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="839911785"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -454,6 +472,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 5}, {280, 21}}</string>
<reference key="NSSuperview" ref="331977945"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="731041733"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -473,6 +492,7 @@
</array>
<string key="NSFrame">{{0, 64}, {320, 46}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="465346123"/>
<string key="NSReuseIdentifierKey">_NS:10</string>
<object class="NSColor" key="IBUIBackgroundColor">
......@@ -486,7 +506,8 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{263, 135}, {44, 44}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="413383277"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
......@@ -510,6 +531,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{14, 135}, {45, 44}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="407550068"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -534,6 +556,7 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{263, 187}, {44, 44}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="271434607"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -553,35 +576,12 @@
<reference key="IBUIFontDescription" ref="838206983"/>
<reference key="IBUIFont" ref="389950768"/>
</object>
<object class="IBUIButton" id="413383277">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{14, 187}, {45, 44}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="265611716"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIHighlightedTitleColor" ref="351379376"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="710600961"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">aspectratio.png</string>
</object>
<reference key="IBUIFontDescription" ref="838206983"/>
<reference key="IBUIFont" ref="389950768"/>
</object>
<object class="IBUILabel" id="271434607">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">-2147483387</int>
<string key="NSFrame">{{61, 273}, {199, 22}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="202327026"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -625,6 +625,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{18, 19}, {284, 23}}</string>
<reference key="NSSuperview" ref="202327026"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="693989578"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -638,6 +639,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 5}, {280, 21}}</string>
<reference key="NSSuperview" ref="202327026"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="205160490"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -658,6 +660,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{18, 57}, {284, 23}}</string>
<reference key="NSSuperview" ref="202327026"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="206931161"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -672,6 +675,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 43}, {280, 21}}</string>
<reference key="NSSuperview" ref="202327026"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="602548150"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -692,6 +696,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{18, 95}, {284, 23}}</string>
<reference key="NSSuperview" ref="202327026"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="606522639"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -706,6 +711,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 81}, {280, 21}}</string>
<reference key="NSSuperview" ref="202327026"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="451270433"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -726,6 +732,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{18, 132}, {284, 23}}</string>
<reference key="NSSuperview" ref="202327026"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="213896343"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -740,6 +747,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 118}, {280, 21}}</string>
<reference key="NSSuperview" ref="202327026"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="23578597"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -760,6 +768,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{18, 170}, {258, 23}}</string>
<reference key="NSSuperview" ref="202327026"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="6762007"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -774,6 +783,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 156}, {280, 21}}</string>
<reference key="NSSuperview" ref="202327026"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="916518907"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -794,6 +804,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{282, 172}, {18, 18}}</string>
<reference key="NSSuperview" ref="202327026"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="644225698"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
......@@ -816,6 +827,7 @@
</array>
<string key="NSFrame">{{0, 335}, {320, 198}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="703439751"/>
<string key="NSReuseIdentifierKey">_NS:10</string>
<object class="NSColor" key="IBUIBackgroundColor">
......@@ -827,6 +839,7 @@
</array>
<string key="NSFrameSize">{320, 568}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="991208409"/>
<reference key="IBUIBackgroundColor" ref="597987587"/>
<object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics">
......@@ -1083,22 +1096,6 @@
</object>
<int key="connectionID">198</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">aspectRatioButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="413383277"/>
</object>
<int key="connectionID">206</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">cropButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="265611716"/>
</object>
<int key="connectionID">207</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">playbackSpeedView</string>
......@@ -1139,6 +1136,14 @@
</object>
<int key="connectionID">219</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">aspectRatioButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="265611716"/>
</object>
<int key="connectionID">222</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">switchSubtitleTrack:</string>
......@@ -1280,16 +1285,7 @@
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">212</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">videoDimensionAction:</string>
<reference key="source" ref="413383277"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">205</int>
<int key="connectionID">221</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
......@@ -1322,7 +1318,6 @@
<reference ref="295483080"/>
<reference ref="331977945"/>
<reference ref="265611716"/>
<reference ref="413383277"/>
<reference ref="271434607"/>
</array>
<reference key="parent" ref="0"/>
......@@ -1525,11 +1520,6 @@
<reference key="object" ref="265611716"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">203</int>
<reference key="object" ref="413383277"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">210</int>
<reference key="object" ref="271434607"/>
......@@ -1614,7 +1604,6 @@
<string key="183.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="185.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="202.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="210.CustomClassName">VLCStatusLabel</string>
<string key="210.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="213.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
......@@ -1637,9 +1626,269 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">220</int>
<int key="maxID">222</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">OBSlider</string>
<string key="superclassName">UISlider</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/OBSlider.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCMovieViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="backward:">id</string>
<string key="closePlayback:">id</string>
<string key="forward:">id</string>
<string key="playPause">id</string>
<string key="playbackSpeedSliderAction:">id</string>
<string key="positionSliderAction:">id</string>
<string key="switchAudioTrack:">id</string>
<string key="switchSubtitleTrack:">id</string>
<string key="videoDimensionAction:">id</string>
<string key="videoFilterSliderAction:">id</string>
<string key="videoFilterToggle:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="backward:">
<string key="name">backward:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="closePlayback:">
<string key="name">closePlayback:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="forward:">
<string key="name">forward:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="playPause">
<string key="name">playPause</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="playbackSpeedSliderAction:">
<string key="name">playbackSpeedSliderAction:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="positionSliderAction:">
<string key="name">positionSliderAction:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="switchAudioTrack:">
<string key="name">switchAudioTrack:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="switchSubtitleTrack:">
<string key="name">switchSubtitleTrack:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="videoDimensionAction:">
<string key="name">videoDimensionAction:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="videoFilterSliderAction:">
<string key="name">videoFilterSliderAction:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="videoFilterToggle:">
<string key="name">videoFilterToggle:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="aspectRatioButton">UIButton</string>
<string key="audioSwitcherButton">UIButton</string>
<string key="backButton">UIBarButtonItem</string>
<string key="brightnessLabel">UILabel</string>
<string key="brightnessSlider">UISlider</string>
<string key="bwdButton">UIButton</string>
<string key="contrastLabel">UILabel</string>
<string key="contrastSlider">UISlider</string><