justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-08 15:50:16 +02:00
Code Issues Projects Packages Wiki Activity Actions

Fix issue with local trailers, cinema mode, prerolls, & next up (#1460)

Browse source 
## Description
Fixes an issue where local trailers wouldn't play (or show in the queue)
if Cinema Mode is enabled and the server has a preroll/intro.

Also fix building the playback queue when "Show next up" is "Never". The
queue is shown, but not automatically played and next item dialog popup
is never shown. But to indicate playback is over, the controller show.

### Related issues
Fixes #1348
Fixes #1303

### Testing
Emulator

## Screenshots
N/A

## AI or LLM usage
None
This commit is contained in:
Damontecres 2026-05-25 16:54:58 -04:00 • committed by GitHub
parent 9eff22e939
commit 510160aceb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/github/damontecres/wholphin/services/PlaylistCreator.kt
View file

@ -248,6 +248,7 @@ class PlaylistCreator
BaseItemKind.MOVIE, BaseItemKind.MOVIE,
BaseItemKind.VIDEO, BaseItemKind.VIDEO,
BaseItemKind.MUSIC_VIDEO, BaseItemKind.MUSIC_VIDEO,
BaseItemKind.TRAILER,
-> { -> {
val list = val list =
buildList { buildList {

13
app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt
View file

@ -330,10 +330,8 @@ class PlaybackViewModel
navigationManager.goBack() navigationManager.goBack()
return return
} }
if (preferences.appPreferences.playbackPreferences.showNextUpWhen != ShowNextUpWhen.NEXT_UP_NEVER) { _state.update {
_state.update { it.copy(playlist = r.playlist)
it.copy(playlist = r.playlist)
}
} }
r.playlist.items.first() r.playlist.items.first()
} }
@ -344,6 +342,7 @@ class PlaybackViewModel
viewModelScope.launch(ExceptionHandler()) { controllerViewState.observe() } viewModelScope.launch(ExceptionHandler()) { controllerViewState.observe() }
playlistItem.item.type == BaseItemKind.TRAILER
val intros = val intros =
// If not resuming playback & cinema mode is enabled, get potential intros // If not resuming playback & cinema mode is enabled, get potential intros
if (positionMs == 0L && preferences.appPreferences.playbackPreferences.cinemaMode) { if (positionMs == 0L && preferences.appPreferences.playbackPreferences.cinemaMode) {
@ -379,7 +378,7 @@ class PlaybackViewModel
playNextUp() playNextUp()
} }
if (!isPlaylist && preferences.appPreferences.playbackPreferences.showNextUpWhen != ShowNextUpWhen.NEXT_UP_NEVER) { if (!isPlaylist) {
val result = playlistCreator.createFrom(queriedItem) val result = playlistCreator.createFrom(queriedItem)
if (result is PlaylistCreationResult.Success && result.playlist.items.isNotEmpty()) { if (result is PlaylistCreationResult.Success && result.playlist.items.isNotEmpty()) {
_state.update { _state.update {
@ -1025,9 +1024,11 @@ class PlaybackViewModel
if (currentItem is PlaylistItem.Intro) { if (currentItem is PlaylistItem.Intro) {
Timber.v("Current item is intro, so playing next up immediately") Timber.v("Current item is intro, so playing next up immediately")
playNextUp() playNextUp()
} else { } else if (preferences.appPreferences.playbackPreferences.showNextUpWhen != ShowNextUpWhen.NEXT_UP_NEVER) {
Timber.v("Setting next up to ${nextItem.id}") Timber.v("Setting next up to ${nextItem.id}")
_state.update { it.copy(nextUp = nextItem.item) } _state.update { it.copy(nextUp = nextItem.item) }
} else {
controllerViewState.showControls()
} }
} }