[Android] Don't apply switchToVideo if a renderer is set

Geoffrey Métais git at videolan.org
Wed Jan 16 16:51:24 CET 2019


vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Wed Jan 16 16:13:54 2019 +0100| [0299e93411060a509ba02e0f215ba2ebd88b20c1] | committer: Geoffrey Métais

Don't apply switchToVideo if a renderer is set

> https://code.videolan.org/videolan/vlc-android/commit/0299e93411060a509ba02e0f215ba2ebd88b20c1
---

 vlc-android/src/org/videolan/vlc/viewmodels/PlaylistModel.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/PlaylistModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/PlaylistModel.kt
index 098596c8c..b066ad615 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/PlaylistModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/PlaylistModel.kt
@@ -172,7 +172,7 @@ class PlaylistModel : ScopedModel(), PlaybackService.Callback by EmptyPBSCallbac
 
     fun switchToVideo() : Boolean {
         service?.apply {
-            if (PlaylistManager.hasMedia() && !isVideoPlaying) {
+            if (PlaylistManager.hasMedia() && !isVideoPlaying && !hasRenderer()) {
                 currentMediaWrapper?.run {
                     if (!hasFlag(MediaWrapper.MEDIA_FORCE_AUDIO) && canSwitchToVideo()) {
                         switchToVideo()



More information about the Android mailing list