Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Geoffrey Métais
VLC-Android
Commits
8a0b6dde
Commit
8a0b6dde
authored
May 07, 2018
by
Geoffrey Métais
Browse files
Safer media & player releasing order
parent
d103df73
Changes
2
Hide whitespace changes
Inline
Side-by-side
vlc-android/src/org/videolan/vlc/media/PlayerController.kt
View file @
8a0b6dde
...
...
@@ -60,7 +60,7 @@ class PlayerController : IVLCVout.Callback, MediaPlayer.EventListener {
setPlaybackStopped
()
}
fun
releaseMedia
()
=
mediaplayer
.
media
?.
let
{
private
fun
releaseMedia
()
=
mediaplayer
.
media
?.
let
{
it
.
setEventListener
(
null
)
it
.
release
()
}
...
...
@@ -172,6 +172,7 @@ class PlayerController : IVLCVout.Callback, MediaPlayer.EventListener {
fun
release
(
player
:
MediaPlayer
=
mediaplayer
)
{
player
.
setEventListener
(
null
)
if
(
isVideoPlaying
())
player
.
vlcVout
.
detachViews
()
releaseMedia
()
launch
(
newSingleThreadContext
(
"vlc-player-release"
))
{
if
(
BuildConfig
.
DEBUG
)
{
// Warn if player release is blocking
try
{
...
...
vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
View file @
8a0b6dde
...
...
@@ -194,13 +194,12 @@ class PlaylistManager(val service: PlaybackService) : MediaWrapperList.EventList
savePosition
()
saveMediaMeta
()
}
player
.
releaseMedia
()
mediaList
.
removeEventListener
(
this
)
previous
.
clear
()
currentIndex
=
-
1
mediaList
.
clear
()
if
(
systemExit
)
player
.
release
()
else
player
.
restart
()
mediaList
.
clear
()
showAudioPlayer
.
value
=
false
service
.
onPlaybackStopped
(
systemExit
)
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment