Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
VLC-iOS
Commits
d2139a54
Commit
d2139a54
authored
Jan 13, 2014
by
Felix Paul Kühne
Browse files
fix continue playback where left-off and show progress in library starting at 5% instead of 10%
parent
69fe2079
Changes
3
Hide whitespace changes
Inline
Side-by-side
Sources/VLCMovieViewController.m
View file @
d2139a54
...
...
@@ -517,7 +517,7 @@
if
(
duration
!=
0
)
playbackPositionInTime
=
@
(
lastPosition
*
(
duration
/
1000
.));
}
if
(
playbackPositionInTime
.
intValue
>
0
&&
(
duration
*
lastPosition
-
duration
)
>
0
)
{
if
(
playbackPositionInTime
.
intValue
>
0
&&
(
duration
*
lastPosition
-
duration
)
<
-
6000
0
)
{
/* start time is not supported for media lists */
[
_mediaPlayer
.
media
addOptions
:@{
@"start-time"
:
playbackPositionInTime
}];
APLog
(
@"set starttime to %i"
,
playbackPositionInTime
.
intValue
);
...
...
@@ -545,7 +545,7 @@
_mediaPlayer
.
videoAspectRatio
=
NULL
;
/* some demuxers don't respect :start-time, so re-try here */
if
(
lastPosition
<
.
95
&&
_mediaPlayer
.
position
<
lastPosition
&&
(
duration
*
lastPosition
-
duration
)
>
0
)
if
(
lastPosition
<
.
95
&&
_mediaPlayer
.
position
<
lastPosition
&&
(
duration
*
lastPosition
-
duration
)
<
-
6000
0
)
_mediaPlayer
.
position
=
lastPosition
;
[
self
_resetIdleTimer
];
...
...
Sources/VLCPlaylistCollectionViewCell.m
View file @
d2139a54
...
...
@@ -231,7 +231,7 @@
if
(
SYSTEM_RUNS_IOS7_OR_LATER
)
{
CGFloat
duration
=
mediaItem
.
duration
.
floatValue
;
if
(
position
>
.
1
f
&&
position
<
.
95
f
&&
(
duration
*
position
-
duration
)
>
0
)
{
if
(
position
>
.
05
f
&&
position
<
.
95
f
&&
(
duration
*
position
-
duration
)
<
-
6000
0
)
{
[(
UITextView
*
)
self
.
mediaIsUnreadView
setText
:[
NSString
stringWithFormat
:
NSLocalizedString
(
@"LIBRARY_MINUTES_LEFT"
,
@""
),
[[
VLCTime
timeWithInt
:(
duration
*
position
-
duration
)]
minuteStringValue
]]];
self
.
mediaIsUnreadView
.
hidden
=
NO
;
}
else
if
(
mediaItem
.
unread
.
intValue
)
{
...
...
Sources/VLCPlaylistTableViewCell.m
View file @
d2139a54
...
...
@@ -223,7 +223,7 @@
if
(
SYSTEM_RUNS_IOS7_OR_LATER
)
{
CGFloat
duration
=
mediaItem
.
duration
.
floatValue
;
if
(
position
>
.
1
f
&&
position
<
.
95
f
&&
(
duration
*
position
-
duration
)
>
0
)
{
if
(
position
>
.
05
f
&&
position
<
.
95
f
&&
(
duration
*
position
-
duration
)
<
-
6000
0
)
{
[(
UITextView
*
)
self
.
mediaIsUnreadView
setText
:[
NSString
stringWithFormat
:
NSLocalizedString
(
@"LIBRARY_MINUTES_LEFT"
,
@""
),
[[
VLCTime
timeWithInt
:(
duration
*
position
-
duration
)]
minuteStringValue
]]];
self
.
mediaIsUnreadView
.
hidden
=
NO
;
}
else
if
(
mediaItem
.
unread
.
intValue
)
{
...
...
Write
Preview
Supports
Markdown
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