Browse Source

Fix the video playlist mode on TV

merge-requests/1614/head
Nicolas Pomepuy 4 years ago
committed by Duncan McNamara
parent
commit
504894569f
  1. 2
      application/television/src/main/java/org/videolan/television/ui/TvUtil.kt
  2. 2
      application/television/src/main/java/org/videolan/television/ui/browser/MediaBrowserTvFragment.kt
  3. 2
      application/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt
  4. 2
      application/vlc-android/src/org/videolan/vlc/viewmodels/mobile/VideosViewModel.kt

2
application/television/src/main/java/org/videolan/television/ui/TvUtil.kt

@ -204,7 +204,7 @@ object TvUtil {
}
else -> {
model.run {
if (!Settings.getInstance(activity).getBoolean(FORCE_PLAY_ALL_VIDEO, false)) {
if (!Settings.getInstance(activity).getBoolean(FORCE_PLAY_ALL_VIDEO, Settings.tvUI)) {
MediaUtils.openMedia(activity, item)
} else {
val list = (dataset.getList().filterIsInstance<MediaWrapper>()).filter { it.type != MediaWrapper.TYPE_DIR }

2
application/television/src/main/java/org/videolan/television/ui/browser/MediaBrowserTvFragment.kt

@ -97,7 +97,7 @@ class MediaBrowserTvFragment : BaseBrowserTvFragment<MediaLibraryItem>() {
override fun onClick(v: View, position: Int, item: MediaLibraryItem) {
lifecycleScope.launchWhenStarted {
if ((viewModel as MediaBrowserViewModel).category == CATEGORY_VIDEOS && !Settings.getInstance(requireContext()).getBoolean(FORCE_PLAY_ALL_VIDEO, true)) {
if ((viewModel as MediaBrowserViewModel).category == CATEGORY_VIDEOS && !Settings.getInstance(requireContext()).getBoolean(FORCE_PLAY_ALL_VIDEO, Settings.tvUI)) {
TvUtil.playMedia(requireActivity(), item as MediaWrapper)
} else {
TvUtil.openMediaFromPaged(requireActivity(), item, viewModel.provider as MedialibraryProvider<out MediaLibraryItem>)

2
application/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt

@ -528,7 +528,7 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
if (mediaWrapper.type == MediaWrapper.TYPE_DIR) browse(mediaWrapper, true)
else {
val forcePlayType = if (mediaWrapper.type == MediaWrapper.TYPE_VIDEO) FORCE_PLAY_ALL_VIDEO else FORCE_PLAY_ALL_AUDIO
if (!Settings.getInstance(requireContext()).getBoolean(forcePlayType, false)) {
if (!Settings.getInstance(requireContext()).getBoolean(forcePlayType, forcePlayType == FORCE_PLAY_ALL_VIDEO && Settings.tvUI)) {
lifecycleScope.launch {
MediaUtils.openMedia(requireContext(), getMediaWithMeta(item))
}

2
application/vlc-android/src/org/videolan/vlc/viewmodels/mobile/VideosViewModel.kt

@ -134,7 +134,7 @@ class VideosViewModel(context: Context, type: VideoGroupingType, val folder: Fol
}
mw.removeFlags(MediaWrapper.MEDIA_FORCE_AUDIO)
val settings = Settings.getInstance(context)
if (!fromStart && (settings.getBoolean(FORCE_PLAY_ALL_VIDEO, false) || forceAll)) {
if (!fromStart && (settings.getBoolean(FORCE_PLAY_ALL_VIDEO, Settings.tvUI) || forceAll)) {
when(val prov = provider) {
is VideosProvider -> MediaUtils.playAll(context, prov, position, false)
is FoldersProvider -> MediaUtils.playAllTracks(context, prov, position, false)

Loading…
Cancel
Save