Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Ewout ter Hoeven
VLC-Android
Commits
a3876afe
Commit
a3876afe
authored
May 22, 2018
by
Geoffrey Métais
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix playlist progression in popup mode
parent
a9ec39df
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
vlc-android/src/org/videolan/vlc/PlaybackService.java
vlc-android/src/org/videolan/vlc/PlaybackService.java
+1
-1
vlc-android/src/org/videolan/vlc/gui/video/PopupManager.java
vlc-android/src/org/videolan/vlc/gui/video/PopupManager.java
+1
-5
No files found.
vlc-android/src/org/videolan/vlc/PlaybackService.java
View file @
a3876afe
...
...
@@ -571,6 +571,7 @@ public class PlaybackService extends MediaBrowserServiceCompat{
public
void
onPlaybackStopped
()
{
hideNotification
();
removePopup
();
if
(
mWakeLock
.
isHeld
())
mWakeLock
.
release
();
changeAudioFocus
(
false
);
mMedialibrary
.
resumeBackgroundOperations
();
...
...
@@ -777,7 +778,6 @@ public class PlaybackService extends MediaBrowserServiceCompat{
@MainThread
public
void
stop
(
boolean
systemExit
)
{
removePopup
();
playlistManager
.
stop
(
systemExit
);
}
...
...
vlc-android/src/org/videolan/vlc/gui/video/PopupManager.java
View file @
a3876afe
...
...
@@ -78,8 +78,7 @@ public class PopupManager implements PlaybackService.Callback, GestureDetector.O
public
void
removePopup
()
{
hideNotification
();
if
(
mRootView
==
null
)
return
;
if
(
mRootView
==
null
)
return
;
mService
.
removeCallback
(
this
);
final
IVLCVout
vlcVout
=
mService
.
getVLCVout
();
vlcVout
.
detachViews
();
...
...
@@ -213,9 +212,6 @@ public class PopupManager implements PlaybackService.Callback, GestureDetector.O
@Override
public
void
onMediaPlayerEvent
(
MediaPlayer
.
Event
event
)
{
switch
(
event
.
type
)
{
case
MediaPlayer
.
Event
.
Stopped
:
removePopup
();
break
;
case
MediaPlayer
.
Event
.
Playing
:
if
(!
mAlwaysOn
)
mRootView
.
setKeepScreenOn
(
true
);
...
...
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