Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLC-iOS
Commits
10e82bd4
Commit
10e82bd4
authored
Jun 09, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Movie View: make sure that the OS shows its volume HUD if we don't display the volume control
parent
81a9c86d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
9 deletions
+36
-9
AspenProject/VLCMovieViewController.h
AspenProject/VLCMovieViewController.h
+2
-1
AspenProject/VLCMovieViewController.m
AspenProject/VLCMovieViewController.m
+2
-0
Resources/VLCMovieViewController~ipad.xib
Resources/VLCMovieViewController~ipad.xib
+16
-3
Resources/VLCMovieViewController~iphone.xib
Resources/VLCMovieViewController~iphone.xib
+16
-5
No files found.
AspenProject/VLCMovieViewController.h
View file @
10e82bd4
...
...
@@ -6,11 +6,11 @@
// Copyright (c) 2013 VideoLAN. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "VLCStatusLabel.h"
#import "VLCHorizontalSwipeGestureRecognizer.h"
#import "VLCVerticalSwipeGestureRecognizer.h"
#import "OBSlider.h"
#import <MediaPlayer/MediaPlayer.h>
@interface
VLCMovieViewController
:
UIViewController
<
VLCMediaPlayerDelegate
,
UIActionSheetDelegate
,
VLCHorizontalSwipeGestureRecognizer
,
VLCVerticalSwipeGestureRecognizer
>
...
...
@@ -26,6 +26,7 @@
@property
(
nonatomic
,
strong
)
IBOutlet
UINavigationBar
*
toolbar
;
@property
(
nonatomic
,
strong
)
IBOutlet
UIView
*
controllerPanel
;
@property
(
nonatomic
,
strong
)
IBOutlet
VLCStatusLabel
*
statusLabel
;
@property
(
nonatomic
,
strong
)
IBOutlet
MPVolumeView
*
volumeView
;
@property
(
nonatomic
,
strong
)
IBOutlet
UIView
*
playingExternallyView
;
@property
(
nonatomic
,
strong
)
IBOutlet
UILabel
*
playingExternallyTitle
;
...
...
AspenProject/VLCMovieViewController.m
View file @
10e82bd4
...
...
@@ -375,6 +375,8 @@
[[
UIApplication
sharedApplication
]
setStatusBarHidden
:
_viewAppeared
?
_controlsHidden
:
NO
withAnimation
:
animationType
];
[
UIView
animateWithDuration
:
animationDuration
animations
:
animationBlock
completion
:
completionBlock
];
_volumeView
.
hidden
=
_controllerPanel
.
hidden
;
}
-
(
void
)
toggleControlsVisible
...
...
Resources/VLCMovieViewController~ipad.xib
View file @
10e82bd4
...
...
@@ -2,9 +2,9 @@
<archive
type=
"com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB"
version=
"8.00"
>
<data>
<int
key=
"IBDocument.SystemTarget"
>
1296
</int>
<string
key=
"IBDocument.SystemVersion"
>
12
D78
</string>
<string
key=
"IBDocument.SystemVersion"
>
12
E55
</string>
<string
key=
"IBDocument.InterfaceBuilderVersion"
>
3084
</string>
<string
key=
"IBDocument.AppKitVersion"
>
1187.3
7
</string>
<string
key=
"IBDocument.AppKitVersion"
>
1187.3
9
</string>
<string
key=
"IBDocument.HIToolboxVersion"
>
626.00
</string>
<object
class=
"NSMutableDictionary"
key=
"IBDocument.PluginVersions"
>
<string
key=
"NS.key.0"
>
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
</string>
...
...
@@ -1266,6 +1266,14 @@
</object>
<int
key=
"connectionID"
>
298
</int>
</object>
<object
class=
"IBConnectionRecord"
>
<object
class=
"IBCocoaTouchOutletConnection"
key=
"connection"
>
<string
key=
"label"
>
volumeView
</string>
<reference
key=
"source"
ref=
"841351856"
/>
<reference
key=
"destination"
ref=
"189567790"
/>
</object>
<int
key=
"connectionID"
>
299
</int>
</object>
<object
class=
"IBConnectionRecord"
>
<object
class=
"IBCocoaTouchEventConnection"
key=
"connection"
>
<string
key=
"label"
>
closePlayback:
</string>
...
...
@@ -1858,7 +1866,7 @@
<nil
key=
"activeLocalization"
/>
<dictionary
class=
"NSMutableDictionary"
key=
"localizations"
/>
<nil
key=
"sourceID"
/>
<int
key=
"maxID"
>
29
8
</int>
<int
key=
"maxID"
>
29
9
</int>
</object>
<object
class=
"IBClassDescriber"
key=
"IBDocument.Classes"
>
<array
class=
"NSMutableArray"
key=
"referencedPartialClassDescriptions"
>
...
...
@@ -1993,6 +2001,7 @@
<string
key=
"toolbar"
>
UINavigationBar
</string>
<string
key=
"videoFilterButton"
>
UIButton
</string>
<string
key=
"videoFilterView"
>
UIView
</string>
<string
key=
"volumeView"
>
MPVolumeView
</string>
</dictionary>
<dictionary
class=
"NSMutableDictionary"
key=
"toOneOutletInfosByName"
>
<object
class=
"IBToOneOutletInfo"
key=
"aspectRatioButton"
>
...
...
@@ -2143,6 +2152,10 @@
<string
key=
"name"
>
videoFilterView
</string>
<string
key=
"candidateClassName"
>
UIView
</string>
</object>
<object
class=
"IBToOneOutletInfo"
key=
"volumeView"
>
<string
key=
"name"
>
volumeView
</string>
<string
key=
"candidateClassName"
>
MPVolumeView
</string>
</object>
</dictionary>
<object
class=
"IBClassDescriptionSource"
key=
"sourceIdentifier"
>
<string
key=
"majorKey"
>
IBProjectSource
</string>
...
...
Resources/VLCMovieViewController~iphone.xib
View file @
10e82bd4
...
...
@@ -2,9 +2,9 @@
<archive
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"8.00"
>
<data>
<int
key=
"IBDocument.SystemTarget"
>
1296
</int>
<string
key=
"IBDocument.SystemVersion"
>
12
D78
</string>
<string
key=
"IBDocument.SystemVersion"
>
12
E55
</string>
<string
key=
"IBDocument.InterfaceBuilderVersion"
>
3084
</string>
<string
key=
"IBDocument.AppKitVersion"
>
1187.3
7
</string>
<string
key=
"IBDocument.AppKitVersion"
>
1187.3
9
</string>
<string
key=
"IBDocument.HIToolboxVersion"
>
626.00
</string>
<object
class=
"NSMutableDictionary"
key=
"IBDocument.PluginVersions"
>
<string
key=
"NS.key.0"
>
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
</string>
...
...
@@ -97,7 +97,6 @@
<string
key=
"NSFrame"
>
{{241, 6}, {59, 29}}
</string>
<reference
key=
"NSSuperview"
ref=
"482727796"
/>
<reference
key=
"NSWindow"
/>
<reference
key=
"NSNextKeyView"
/>
<string
key=
"NSReuseIdentifierKey"
>
_NS:9
</string>
<bool
key=
"IBUIOpaque"
>
NO
</bool>
<string
key=
"targetRuntimeIdentifier"
>
IBCocoaTouchFramework
</string>
...
...
@@ -340,7 +339,6 @@
<string
key=
"NSFrame"
>
{{20, 57}, {284, 22}}
</string>
<reference
key=
"NSSuperview"
ref=
"644225698"
/>
<reference
key=
"NSWindow"
/>
<reference
key=
"NSNextKeyView"
/>
<string
key=
"NSReuseIdentifierKey"
>
_NS:9
</string>
<string
key=
"targetRuntimeIdentifier"
>
IBCocoaTouchFramework
</string>
</object>
...
...
@@ -1286,6 +1284,14 @@
</object>
<int
key=
"connectionID"
>
222
</int>
</object>
<object
class=
"IBConnectionRecord"
>
<object
class=
"IBCocoaTouchOutletConnection"
key=
"connection"
>
<string
key=
"label"
>
volumeView
</string>
<reference
key=
"source"
ref=
"372490531"
/>
<reference
key=
"destination"
ref=
"1065831830"
/>
</object>
<int
key=
"connectionID"
>
275
</int>
</object>
<object
class=
"IBConnectionRecord"
>
<object
class=
"IBCocoaTouchEventConnection"
key=
"connection"
>
<string
key=
"label"
>
switchSubtitleTrack:
</string>
...
...
@@ -1878,7 +1884,7 @@
<nil
key=
"activeLocalization"
/>
<dictionary
class=
"NSMutableDictionary"
key=
"localizations"
/>
<nil
key=
"sourceID"
/>
<int
key=
"maxID"
>
27
4
</int>
<int
key=
"maxID"
>
27
5
</int>
</object>
<object
class=
"IBClassDescriber"
key=
"IBDocument.Classes"
>
<array
class=
"NSMutableArray"
key=
"referencedPartialClassDescriptions"
>
...
...
@@ -2013,6 +2019,7 @@
<string
key=
"toolbar"
>
UINavigationBar
</string>
<string
key=
"videoFilterButton"
>
UIButton
</string>
<string
key=
"videoFilterView"
>
UIView
</string>
<string
key=
"volumeView"
>
MPVolumeView
</string>
</dictionary>
<dictionary
class=
"NSMutableDictionary"
key=
"toOneOutletInfosByName"
>
<object
class=
"IBToOneOutletInfo"
key=
"aspectRatioButton"
>
...
...
@@ -2163,6 +2170,10 @@
<string
key=
"name"
>
videoFilterView
</string>
<string
key=
"candidateClassName"
>
UIView
</string>
</object>
<object
class=
"IBToOneOutletInfo"
key=
"volumeView"
>
<string
key=
"name"
>
volumeView
</string>
<string
key=
"candidateClassName"
>
MPVolumeView
</string>
</object>
</dictionary>
<object
class=
"IBClassDescriptionSource"
key=
"sourceIdentifier"
>
<string
key=
"majorKey"
>
IBProjectSource
</string>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment