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
661fee01
Commit
661fee01
authored
Jan 29, 2018
by
Geoffrey Métais
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show notification while casting
parent
7d8cfdad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
vlc-android/src/org/videolan/vlc/PlaybackService.java
vlc-android/src/org/videolan/vlc/PlaybackService.java
+5
-2
vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
+3
-2
No files found.
vlc-android/src/org/videolan/vlc/PlaybackService.java
View file @
661fee01
...
...
@@ -497,10 +497,13 @@ public class PlaybackService extends MediaBrowserServiceCompat{
mHandler
.
sendEmptyMessage
(
SHOW_PROGRESS
);
changeAudioFocus
(
true
);
if
(!
mWakeLock
.
isHeld
())
mWakeLock
.
acquire
();
if
(!
mKeyguardManager
.
inKeyguardRestrictedInputMode
()
&&
!
playlistManager
.
getVideoBackground
()
&&
playlistManager
.
switchToVideo
())
{
if
(!
mKeyguardManager
.
inKeyguardRestrictedInputMode
()
&&
!
playlistManager
.
getVideoBackground
()
&&
!
hasRenderer
()
&&
playlistManager
.
switchToVideo
())
{
hideNotification
();
}
else
{
showPlayer
();
if
(!
hasRenderer
())
showPlayer
();
showNotification
();
}
break
;
...
...
vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
View file @
661fee01
...
...
@@ -292,8 +292,9 @@ class PlaylistManager(val service: PlaybackService) : MediaWrapperList.EventList
val
media
=
getCurrentMedia
()
if
(
media
===
null
||
media
.
hasFlag
(
MediaWrapper
.
MEDIA_FORCE_AUDIO
)
||
!
player
.
canSwitchToVideo
())
return
false
val
hasRenderer
=
RendererDelegate
.
selectedRenderer
!==
null
videoBackground
=
false
if
(
player
.
isVideoPlaying
())
{
//Player is already running, just send it an intent
if
(
player
.
isVideoPlaying
()
&&
!
hasRenderer
)
{
//Player is already running, just send it an intent
player
.
setVideoTrackEnabled
(
true
)
LocalBroadcastManager
.
getInstance
(
service
).
sendBroadcast
(
VideoPlayerActivity
.
getIntent
(
Constants
.
PLAY_FROM_SERVICE
,
...
...
@@ -301,7 +302,7 @@ class PlaylistManager(val service: PlaybackService) : MediaWrapperList.EventList
}
else
if
(!
player
.
switchToVideo
)
{
//Start the video player
VideoPlayerActivity
.
startOpened
(
VLCApplication
.
getAppContext
(),
media
.
uri
,
currentIndex
)
player
.
switchToVideo
=
true
if
(!
hasRenderer
)
player
.
switchToVideo
=
true
}
return
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