Skip to content

Use External Player Popup #4487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
haydenkz wants to merge 9 commits into from
Closed

Use External Player Popup #4487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
81724fc
Add popup to play button, add PlaybackDestination for External player.
Feb 26, 2025
14322e7
Merge branch 'jellyfin:master' into issue-4465
Feb 26, 2025
ee0ed7c
Merge branch 'jellyfin:master' into issue-4465
Feb 26, 2025
6825b12
consolidate play methods, replace getPlaybackDestinationEX with getEx…
Feb 26, 2025
fa51b6e
revert changes to original play() method calls in favor of an overloa…
Feb 26, 2025
b5b8ebd
remove test remain from another issue...
Feb 26, 2025
d91fae0
Merge branch 'master' into issue-4465
Feb 27, 2025
bb06965
Merge branch 'master' into issue-4465
Mar 4, 2025
556fd4e
Merge branch 'master' into issue-4465
Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,13 @@ public void onClick(View v) {
}
});

playButton.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View view) {
FullDetailsFragmentHelperKt.forceExternalPlayerPopup(FullDetailsFragment.this, view, mBaseItem);
return true;
}
});
mDetailsOverviewRow.addAction(playButton);

if (resumeButtonVisible) {
Expand Down Expand Up @@ -1194,6 +1201,10 @@ void shufflePlay() {
}

void play(final BaseItemDto item, final int pos, final boolean shuffle) {
play(item, pos, shuffle, false);
}

void play(final BaseItemDto item, final int pos, final boolean shuffle, final boolean forceExternalPlayer) {
playbackHelper.getValue().getItemsToPlay(getContext(), item, pos == 0 && item.getType() == BaseItemKind.MOVIE, shuffle, new Response<List<BaseItemDto>>() {
@Override
public void onResponse(List<BaseItemDto> response) {
Expand All @@ -1206,7 +1217,9 @@ public void onResponse(List<BaseItemDto> response) {
mediaManager.getValue().playNow(requireContext(), response, 0, shuffle);
} else {
videoQueueManager.getValue().setCurrentVideoQueue(response);
Destination destination = KoinJavaComponent.<PlaybackLauncher>get(PlaybackLauncher.class).getPlaybackDestination(item.getType(), pos);
Destination destination = forceExternalPlayer
? KoinJavaComponent.<PlaybackLauncher>get(PlaybackLauncher.class).getExternalPlayer(item.getType(), pos)
: KoinJavaComponent.<PlaybackLauncher>get(PlaybackLauncher.class).getPlaybackDestination(item.getType(), pos);
navigationRepository.getValue().navigate(destination);
}
}
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragmentHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,15 @@ fun FullDetailsFragment.showDetailsMenu(
}
}.showIfNotEmpty()

fun FullDetailsFragment.forceExternalPlayerPopup(
view: View,
mBaseItem: BaseItemDto,
) = popupMenu(requireContext(), view) {
item(getString(R.string.pref_external_player)) {
play(mBaseItem, 0, false, true)
}
}.show()

fun FullDetailsFragment.createFakeSeriesTimerBaseItemDto(timer: SeriesTimerInfoDto) = BaseItemDto(
id = requireNotNull(timer.id).toUUID(),
type = BaseItemKind.FOLDER,
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackLauncher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import kotlin.time.Duration.Companion.milliseconds
interface PlaybackLauncher {
fun useExternalPlayer(itemType: BaseItemKind?): Boolean
fun getPlaybackDestination(itemType: BaseItemKind?, position: Int): Destination
fun getExternalPlayer(itemType: BaseItemKind?, position: Int): Destination
}

class GarbagePlaybackLauncher(
Expand All @@ -28,6 +29,9 @@ class GarbagePlaybackLauncher(
else -> false
}

override fun getExternalPlayer(itemType: BaseItemKind?, position: Int): Destination =
Destinations.externalPlayer(position.milliseconds)

override fun getPlaybackDestination(itemType: BaseItemKind?, position: Int) = when {
useExternalPlayer(itemType) -> Destinations.externalPlayer(position.milliseconds)
else -> Destinations.videoPlayer(position)
Expand All @@ -37,4 +41,5 @@ class GarbagePlaybackLauncher(
class RewritePlaybackLauncher : PlaybackLauncher {
override fun useExternalPlayer(itemType: BaseItemKind?) = false
override fun getPlaybackDestination(itemType: BaseItemKind?, position: Int) = Destinations.playbackRewritePlayer(position)
override fun getExternalPlayer(itemType: BaseItemKind?, position: Int) = Destinations.playbackRewritePlayer(position)
}