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
Ewout ter Hoeven
VLC-Android
Commits
69cc2776
Commit
69cc2776
authored
Mar 31, 2015
by
Geoffrey Métais
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix seek, use setTime as a fallback
parent
9bc6156d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
...d/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+6
-5
No files found.
vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
View file @
69cc2776
...
...
@@ -2109,11 +2109,12 @@ public class VideoPlayerActivity extends ActionBarActivity implements IVideoPlay
}
private
void
seek
(
long
position
,
float
length
)
{
if
(
length
==
0
f
)
return
;
mForcedTime
=
position
;
mLastTime
=
mLibVLC
.
getTime
();
mLibVLC
.
setPosition
(
position
/
length
);
if
(
length
==
0
f
)
mLibVLC
.
setTime
(
position
);
else
mLibVLC
.
setPosition
(
position
/
length
);
}
private
void
seekDelta
(
int
delta
)
{
...
...
@@ -2646,10 +2647,10 @@ public class VideoPlayerActivity extends ActionBarActivity implements IVideoPlay
editor
.
putLong
(
PreferencesActivity
.
VIDEO_RESUME_TIME
,
-
1
);
Util
.
commitPreferences
(
editor
);
if
(
rTime
>
0
)
seek
(
rTime
,
media
.
getLength
()
);
seek
(
rTime
);
if
(
intentPosition
>
0
)
seek
(
intentPosition
,
media
.
getLength
()
);
seek
(
intentPosition
);
}
// Get possible subtitles
...
...
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