Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
528
Issue boards
Milestones
Wiki
Code
Merge requests
14
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
fcb45f49
Commit
fcb45f49
authored
7 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
PlaylistManager: Save current index before expand
parent
8ebdc390
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
+4
-3
4 additions, 3 deletions
vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
with
4 additions
and
3 deletions
vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
+
4
−
3
View file @
fcb45f49
...
...
@@ -503,20 +503,21 @@ class PlaylistManager(val service: PlaybackService) : MediaWrapperList.EventList
*/
@MainThread
private
suspend
fun
expand
(
updateHistory
:
Boolean
):
Int
{
val
index
=
currentIndex
val
ml
=
player
.
expand
()
var
ret
=
-
1
if
(
ml
!=
null
&&
ml
.
count
>
0
)
{
val
mrl
=
if
(
updateHistory
)
getCurrentMedia
()
?.
location
else
null
mediaList
.
remove
(
currentI
ndex
)
mediaList
.
remove
(
i
ndex
)
for
(
i
in
ml
.
count
-
1
downTo
0
)
{
val
child
=
ml
.
getMediaAt
(
i
)
child
.
parse
()
mediaList
.
insert
(
currentI
ndex
,
MediaWrapper
(
child
))
mediaList
.
insert
(
i
ndex
,
MediaWrapper
(
child
))
child
.
release
()
}
if
(
mrl
!==
null
&&
ml
.
count
==
1
)
medialibrary
.
addToHistory
(
mrl
,
getCurrentMedia
()
!!
.
title
)
ret
=
currentI
ndex
ret
=
i
ndex
}
ml
?.
release
()
return
ret
...
...
This diff is collapsed.
Click to expand it.
Geoffrey Métais
@Dekans
mentioned in commit
c3b48fc9
·
7 years ago
mentioned in commit
c3b48fc9
mentioned in commit c3b48fc9f48c9db94f5f804e7eeeb62fcf0de0c7
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment