open/vlc-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Video player: Correctly apply extra title

Browse Source 
Fix #1156
This commit is contained in:
Geoffrey Métais
2020-01-20 17:00:27 +01:00
committed by Nicolas Pomepuy
parent a295f5506f
commit 84d7febc04
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt
View File

@@ -2513,6 +2513,7 @@ open class VideoPlayerActivity : AppCompatActivity(), IPlaybackSettingsControlle
/* prepare playback */
val medialoaded = media != null
if (!medialoaded) media = if (hasMedia) currentMedia else MLServiceLocator.getAbstractMediaWrapper(videoUri!!)
itemTitle?.let { media?.title = Uri.decode(it) }
if (wasPaused)
media!!.addFlags(MediaWrapper.MEDIA_PAUSED)
if (intent.hasExtra(PLAY_DISABLE_HARDWARE))
@@ -2534,10 +2535,7 @@ open class VideoPlayerActivity : AppCompatActivity(), IPlaybackSettingsControlle
onPlaying()
} else
service.playIndex(positionInPlaylist)
} else if (medialoaded)
service.load(media)
else
service.loadUri(videoUri)
} else service.load(media)
// Get the title
if (itemTitle == null && !TextUtils.equals(videoUri!!.scheme, "content"))