Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLC-iOS
Commits
3996a59e
Commit
3996a59e
authored
Jun 05, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Movie View: hide video filters and speed slider after a time out of 4s
parent
9b49df64
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
0 deletions
+35
-0
AspenProject/VLCMovieViewController.m
AspenProject/VLCMovieViewController.m
+35
-0
No files found.
AspenProject/VLCMovieViewController.m
View file @
3996a59e
...
...
@@ -28,6 +28,7 @@
NSUInteger
_currentAspectRatioMask
;
NSTimer
*
_idleTimer
;
NSTimer
*
_videoFilterIdleTimer
;
BOOL
_shouldResumePlaying
;
BOOL
_viewAppeared
;
...
...
@@ -257,6 +258,8 @@
self
.
mediaItem
.
lastPosition
=
@
([
_mediaPlayer
position
]);
[
_mediaPlayer
stop
];
_mediaPlayer
=
nil
;
// save memory and some CPU time
[
self
videoFilterIdleTimerExceeded
];
// hide filter UI for next run
}
-
(
id
)
initWithNibName
:(
NSString
*
)
nibNameOrNil
bundle
:(
NSBundle
*
)
nibBundleOrNil
...
...
@@ -399,6 +402,20 @@
}
}
-
(
void
)
_resetVideoFilterIdleTimer
{
if
(
!
_videoFilterIdleTimer
)
_videoFilterIdleTimer
=
[
NSTimer
scheduledTimerWithTimeInterval
:
4
.
target:
self
selector:
@selector
(
videoFilterIdleTimerExceeded
)
userInfo:
nil
repeats:
NO
];
else
{
if
(
fabs
([
_videoFilterIdleTimer
.
fireDate
timeIntervalSinceNow
])
<
4
.)
[
_videoFilterIdleTimer
setFireDate
:[
NSDate
dateWithTimeIntervalSinceNow
:
4
.]];
}
}
-
(
void
)
idleTimerExceeded
{
_idleTimer
=
nil
;
...
...
@@ -406,6 +423,19 @@
[
self
toggleControlsVisible
];
}
-
(
void
)
videoFilterIdleTimerExceeded
{
_videoFilterIdleTimer
=
nil
;
if
(
!
_videoFiltersHidden
)
_videoFiltersHidden
=
YES
;
if
(
!
_playbackSpeedViewHidden
)
_playbackSpeedViewHidden
=
YES
;
[
self
setControlsHidden
:
_controlsHidden
animated
:
YES
];
}
-
(
UIResponder
*
)
nextResponder
{
[
self
_resetIdleTimer
];
...
...
@@ -574,6 +604,8 @@
self
.
videoFilterView
.
hidden
=
!
_videoFiltersHidden
;
_videoFiltersHidden
=
self
.
videoFilterView
.
hidden
;
self
.
controllerPanel
.
hidden
=
!
_videoFiltersHidden
;
[
self
_resetVideoFilterIdleTimer
];
}
-
(
IBAction
)
videoFilterSliderAction
:(
id
)
sender
...
...
@@ -600,6 +632,7 @@
}
else
APLog
(
@"unknown sender for videoFilterSliderAction"
);
[
self
_resetIdleTimer
];
[
self
_resetVideoFilterIdleTimer
];
}
#pragma mark - playback view
...
...
@@ -612,6 +645,7 @@
_currentPlaybackRate
=
rate
;
[
self
_updatePlaybackSpeedIndicator
];
[
self
_resetIdleTimer
];
[
self
_resetVideoFilterIdleTimer
];
}
-
(
void
)
_updatePlaybackSpeedIndicator
...
...
@@ -645,6 +679,7 @@
self
.
playbackSpeedView
.
hidden
=
!
_playbackSpeedViewHidden
;
_playbackSpeedViewHidden
=
self
.
playbackSpeedView
.
hidden
;
[
self
_resetVideoFilterIdleTimer
];
}
else
if
(
sender
==
self
.
aspectRatioButton
)
{
NSUInteger
count
=
[
_aspectRatios
count
];
...
...
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