Skip to content

Can Select Artist or Album Artist to be displayed on Music > Artists Page - #2127

Merged
damontecres merged 4 commits into
damontecres:mainfrom
clintjb:feature/album-artist-source
Oct 31, 2026
Merged

damontecres merged 4 commits into
damontecres:mainfrom
clintjb:feature/album-artist-source

Conversation

@clintjb

@clintjb clintjb commented Oct 25, 2026 •

Copy link
Copy Markdown
Contributor

Description

The Music / Artists view currently appears to use the artist metadata from individual tracks. While at a track level this makes perfect sense, it can result in a very noisy and fragmented artists view.

For example, an album by Eminem might contain tracks with artists such as:

  • Eminem
  • Eminem feat. 50 Cent
  • Eminem ft. Rihanna
  • Eminem & Dr. Dre

Each of these seem to appear as a separate artist entry (even though they are all tracks from the same album by Eminem)

This becomes particularly noticeable in large music libraries, where featured artists, collaborations, remixes, and slightly different artist metadata ends up resulting in a large number of sparsely populated or duplicate / strange looking artist entries.

This PR adds an option / toggle to determine which metadata field is used to populate the artists view. This option sits neatly within the current artist view settings e.g. Music > Artists > View options > Artist source

  • Artist (current behavior)
  • Album Artist (use the album artist metadata instead)

That Artist setting stays as the default choice (so nobody sees a change unless they pick it) but now gives the option to filter down only to Album Artists if desired - this choice is saved per library and applies immediately.

Related issues

Closes #1868

Testing

I've tested it extensively on an Amazon Fire TV Cube Gen 2 (using the firetv debug variant) the following manual tests were performed:

  • The list changes when you pick Album artist and importantly the selection survives a full app restart
  • It was tested on a large library and can confirm only the Album Artists remained (e.g. only one Eminem entry remained)

Automated checks were run (testFiretvDebugUnitTest & pre-commit) As well as two new tests being added to the CollectionFolderViewModelTest.kt:

  • For letter counting its checking via the album artist endpoint (and not the standard one) when the source is set as ALBUM_ARTIST
  • When the source is changed via the saveViewOptions its triggering a load from the album artist endpoint

Screenshots

Please see the screenshots below showing the UI impact / modification:
1
2
3

AI or LLM usage

The code was written / supported with Claude - the approach (e.g. design / storing the choice in ViewOptions) endpoint research etc was done by myself - I reviewed the approaches / refactoring and than deployed a debug.apk to my local device to confirm everything was working as expected.

I've reviewed each line and can explain it / the thinking to approaches / logic etc and am comfortable submitting the PR.

@damontecres damontecres left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the contribution! This is more-or-less how I imagined implementing this.

My only hangup is storing the value in ViewOptions. Doing so is definitely the easiest option, but this setting is very specific whereas ViewOptions is used very generally. I have to think about this and whether other options like app preferences or the key-value service would be better.

@damontecres damontecres added the enhancement New feature or request label Oct 26, 2026
@damontecres damontecres added this to the Next minor release milestone Oct 26, 2026
@clintjb

clintjb commented Oct 26, 2026 •

Copy link
Copy Markdown
Contributor Author

Thanks for getting back to me and that certainly makes sense... I went with ViewOptions as it was the simplest place to persist it, but I'm obviously more than happy to move it. Once you've had some time to mull it over - If you have a preference between the app preferences or a KV service, let me know and I'll update the PR...
Cheers

@damontecres damontecres left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I decided to use a sealed interface to store library-specific view options info. This has little difference from your implementation right now. But it will easier to expand in the future if needed.

Otherwise, I've tested this and it works well. Thanks for the contribution!

@damontecres
damontecres merged commit d2713ff into damontecres:main Oct 31, 2026
2 checks passed
TheBenPsych pushed a commit to TheBenPsych/MyStream that referenced this pull request Nov 3, 2026
…Page (damontecres#2127)

The Music / Artists view currently appears to use the artist metadata
from individual tracks. While at a track level this makes perfect sense,
it can result in a very noisy and fragmented artists view.

For example, an album by Eminem might contain tracks with artists such
as:
- Eminem
- Eminem feat. 50 Cent
- Eminem ft. Rihanna
- Eminem & Dr. Dre

Each of these seem to appear as a separate artist entry (even though
they are all tracks from the same album by Eminem)

This becomes particularly noticeable in large music libraries, where
featured artists, collaborations, remixes, and slightly different artist
metadata ends up resulting in a large number of sparsely populated or
duplicate / strange looking artist entries.

This PR adds an option / toggle to determine which metadata field is
used to populate the artists view. This option sits neatly within the
current artist view settings e.g. Music > Artists > View options >
Artist source
- Artist (current behavior)
- Album Artist (use the album artist metadata instead)

That Artist setting stays as the default choice (so nobody sees a change
unless they pick it) but now gives the option to filter down only to
Album Artists if desired - this choice is saved per library and applies
immediately.

Closes damontecres#1868

I've tested it extensively on an Amazon Fire TV Cube Gen 2 (using the
firetv debug variant) the following manual tests were performed:
- The list changes when you pick Album artist and importantly the
selection survives a full app restart
- It was tested on a large library and can confirm only the Album
Artists remained (e.g. only one Eminem entry remained)

Automated checks were run (testFiretvDebugUnitTest & pre-commit) As well
as two new tests being added to the CollectionFolderViewModelTest.kt:
- For letter counting its checking via the album artist endpoint (and
not the standard one) when the source is set as ALBUM_ARTIST
- When the source is changed via the saveViewOptions its triggering a
load from the album artist endpoint

Please see the screenshots below showing the UI impact / modification:
<img width="4624" height="3472" alt="1"
src="https://github.com/user-attachments/assets/6b53575e-ad15-4f66-b9c0-074657128a1d"
/>
<img width="4624" height="3472" alt="2"
src="https://github.com/user-attachments/assets/528c5766-44d8-43d3-8519-778f5aab7441"
/>
<img width="4624" height="3472" alt="3"
src="https://github.com/user-attachments/assets/5de2fb6d-173d-4ac3-ad1b-e08f27f4dafd"
/>

The code was written / supported with Claude - the approach (e.g. design
/ storing the choice in ViewOptions) endpoint research etc was done by
myself - I reviewed the approaches / refactoring and than deployed a
debug.apk to my local device to confirm everything was working as
expected.

I've reviewed each line and can explain it / the thinking to approaches
/ logic etc and am comfortable submitting the PR.

---------

Co-authored-by: Damontecres <damontecres@gmail.com>
(cherry picked from commit d2713ff)
TheBenPsych added a commit to TheBenPsych/MyStream that referenced this pull request Nov 3, 2026
… as smooth looping videos (#226)

* Faster and smoother: smaller updates, right-sized pictures, steadier fast scrolling, games ready sooner, robot check on every build

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Tower speed check-up on the Server page

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Kids can play games rated for everyone; movie games stay off the Kids profile

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Cast to any TV with Chromecast from the phone, and play games away from home

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Request audio focus for video playback so background music pauses (damontecres#2151)

## Description
The video player passes false to setAudioAttributes (since damontecres#1258 I
think), as ExoPlayer never requests audio focus. This will pass `true`.

### Related issues
#447, damontecres#1258.

### Testing
Not tested on a device.

### Screenshots
Not applicable

### AI or LLM usage
None.

---------

Co-authored-by: Damontecres <damontecres@gmail.com>
(cherry picked from commit c45c662)

* Can Select Artist or Album Artist to be displayed on Music > Artists Page (damontecres#2127)

The Music / Artists view currently appears to use the artist metadata
from individual tracks. While at a track level this makes perfect sense,
it can result in a very noisy and fragmented artists view.

For example, an album by Eminem might contain tracks with artists such
as:
- Eminem
- Eminem feat. 50 Cent
- Eminem ft. Rihanna
- Eminem & Dr. Dre

Each of these seem to appear as a separate artist entry (even though
they are all tracks from the same album by Eminem)

This becomes particularly noticeable in large music libraries, where
featured artists, collaborations, remixes, and slightly different artist
metadata ends up resulting in a large number of sparsely populated or
duplicate / strange looking artist entries.

This PR adds an option / toggle to determine which metadata field is
used to populate the artists view. This option sits neatly within the
current artist view settings e.g. Music > Artists > View options >
Artist source
- Artist (current behavior)
- Album Artist (use the album artist metadata instead)

That Artist setting stays as the default choice (so nobody sees a change
unless they pick it) but now gives the option to filter down only to
Album Artists if desired - this choice is saved per library and applies
immediately.

Closes damontecres#1868

I've tested it extensively on an Amazon Fire TV Cube Gen 2 (using the
firetv debug variant) the following manual tests were performed:
- The list changes when you pick Album artist and importantly the
selection survives a full app restart
- It was tested on a large library and can confirm only the Album
Artists remained (e.g. only one Eminem entry remained)

Automated checks were run (testFiretvDebugUnitTest & pre-commit) As well
as two new tests being added to the CollectionFolderViewModelTest.kt:
- For letter counting its checking via the album artist endpoint (and
not the standard one) when the source is set as ALBUM_ARTIST
- When the source is changed via the saveViewOptions its triggering a
load from the album artist endpoint

Please see the screenshots below showing the UI impact / modification:
<img width="4624" height="3472" alt="1"
src="https://github.com/user-attachments/assets/6b53575e-ad15-4f66-b9c0-074657128a1d"
/>
<img width="4624" height="3472" alt="2"
src="https://github.com/user-attachments/assets/528c5766-44d8-43d3-8519-778f5aab7441"
/>
<img width="4624" height="3472" alt="3"
src="https://github.com/user-attachments/assets/5de2fb6d-173d-4ac3-ad1b-e08f27f4dafd"
/>

The code was written / supported with Claude - the approach (e.g. design
/ storing the choice in ViewOptions) endpoint research etc was done by
myself - I reviewed the approaches / refactoring and than deployed a
debug.apk to my local device to confirm everything was working as
expected.

I've reviewed each line and can explain it / the thinking to approaches
/ logic etc and am comfortable submitting the PR.

---------

Co-authored-by: Damontecres <damontecres@gmail.com>
(cherry picked from commit d2713ff)

* Allow play/pause from untrusted media controllers (damontecres#2145)

## Description
- From media3 1.11, controllers that aren't trusted get read-only player
commands by default.
- Google Home sends its commands through
com.google.android.apps.mediashell (Google's Cast service on the TV),
which isn't trusted, so play/pause from it was dropped.
- Logcat showed: MediaSessionLegacyStub: Calling play() omitted due to
COMMAND_PLAY_PAUSE not being available
- The change: a MediaSession.Callback (TrustAllControllersCallback in
PlayerFactory.kt) that gives every controller all player commands again.
It uses onConnectAsync and AcceptedResultBuilder(session, controller),
so untrusted controllers keep the restricted session commands.
- It's applied to the video session (createMediaSession) and the music
session (MusicService).
- It probably started with the media3 1.11 bump in damontecres#1814.

### Related issues
<!-- If this is a new feature or a change, there must be a discussion in
an issue first, reference the issue here -->
<!-- If fixing a bug, reference the bug issue here, or describe the bug,
including steps to reproduce -->
- Fixes damontecres#2087

### Testing
- JMGO N1S 4K, Google TV, Android 14, ExoPlayer.
- Before the fix: play/pause from Google Home did nothing, and logcat
showed the "omitted" warning.
- After the fix: pause and play from Google Home work. Logcat shows each
command reaching handleSetPlayWhenReady, and the warning is gone.
- The TV remote still works.
- I didn't test music playback; leave that out or test it first.

## Screenshots
- None; no UI changes.

## AI or LLM usage
- Claude Code read the logcat output, found the media3 1.11
untrusted-controller change, and wrote TrustAllControllersCallback plus
the two setCallback(...) calls.

(cherry picked from commit 46bf78a)

* Update dependencies (damontecres#2157)

Updates dependencies to max versions still supporting API level 23

(cherry picked from commit 38bd690)

* Fix HDHomeRun Live TV direct playback by including the live stream ID (damontecres#2163)

## Description

I was having trouble playing HDHomeRun channels through Jellyfin in
Wholphin. They started quickly in the official Jellyfin app, but
Wholphin would sometimes spin or fall back when switching channels.

This change includes the live stream ID returned by Jellyfin when
building the Direct Play URL. It also adds a regression test.

### Related issues

Related to damontecres#2014 and possibly damontecres#1903. My testing was with an HDHomeRun; I
haven’t verified the TVHeadend setups in those reports.

### Testing

Tested on a Google TV Streamer with multiple local channels, FAST
channels, and movie playback. The tested content used Direct Play, and
the HDHomeRun tuners were released after stopping.

All 18 playback tests and the formatting check passed after the
requested test cleanup.

## Screenshots

No UI changes.

## AI or LLM usage

I used OpenAI Codex to help investigate the issue, implement the change
in PlaybackViewModel.kt, add the regression test in
PlaybackViewModelTests.kt, and run validation. Codex also helped draft
this description.

(cherry picked from commit 06c1d62)

* Holiday scenes on Who's watching play as light looping videos instead of being drawn live

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

---------

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: hawkinslabdev <59891413+hawkinslabdev@users.noreply.github.com>
Co-authored-by: Damontecres <damontecres@gmail.com>
Co-authored-by: Clint Bird <clintjb@gmail.com>
Co-authored-by: Ali Alaei <49282631+aalaei@users.noreply.github.com>
Co-authored-by: coulterj <coulterjohnson@gmail.com>
TheBenPsych added a commit to TheBenPsych/MyStream that referenced this pull request Nov 3, 2026
…ler pieces (#228)

* Faster and smoother: smaller updates, right-sized pictures, steadier fast scrolling, games ready sooner, robot check on every build

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Tower speed check-up on the Server page

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Kids can play games rated for everyone; movie games stay off the Kids profile

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Cast to any TV with Chromecast from the phone, and play games away from home

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Request audio focus for video playback so background music pauses (damontecres#2151)

## Description
The video player passes false to setAudioAttributes (since damontecres#1258 I
think), as ExoPlayer never requests audio focus. This will pass `true`.

### Related issues
#447, damontecres#1258.

### Testing
Not tested on a device.

### Screenshots
Not applicable

### AI or LLM usage
None.

---------

Co-authored-by: Damontecres <damontecres@gmail.com>
(cherry picked from commit c45c662)

* Can Select Artist or Album Artist to be displayed on Music > Artists Page (damontecres#2127)

The Music / Artists view currently appears to use the artist metadata
from individual tracks. While at a track level this makes perfect sense,
it can result in a very noisy and fragmented artists view.

For example, an album by Eminem might contain tracks with artists such
as:
- Eminem
- Eminem feat. 50 Cent
- Eminem ft. Rihanna
- Eminem & Dr. Dre

Each of these seem to appear as a separate artist entry (even though
they are all tracks from the same album by Eminem)

This becomes particularly noticeable in large music libraries, where
featured artists, collaborations, remixes, and slightly different artist
metadata ends up resulting in a large number of sparsely populated or
duplicate / strange looking artist entries.

This PR adds an option / toggle to determine which metadata field is
used to populate the artists view. This option sits neatly within the
current artist view settings e.g. Music > Artists > View options >
Artist source
- Artist (current behavior)
- Album Artist (use the album artist metadata instead)

That Artist setting stays as the default choice (so nobody sees a change
unless they pick it) but now gives the option to filter down only to
Album Artists if desired - this choice is saved per library and applies
immediately.

Closes damontecres#1868

I've tested it extensively on an Amazon Fire TV Cube Gen 2 (using the
firetv debug variant) the following manual tests were performed:
- The list changes when you pick Album artist and importantly the
selection survives a full app restart
- It was tested on a large library and can confirm only the Album
Artists remained (e.g. only one Eminem entry remained)

Automated checks were run (testFiretvDebugUnitTest & pre-commit) As well
as two new tests being added to the CollectionFolderViewModelTest.kt:
- For letter counting its checking via the album artist endpoint (and
not the standard one) when the source is set as ALBUM_ARTIST
- When the source is changed via the saveViewOptions its triggering a
load from the album artist endpoint

Please see the screenshots below showing the UI impact / modification:
<img width="4624" height="3472" alt="1"
src="https://github.com/user-attachments/assets/6b53575e-ad15-4f66-b9c0-074657128a1d"
/>
<img width="4624" height="3472" alt="2"
src="https://github.com/user-attachments/assets/528c5766-44d8-43d3-8519-778f5aab7441"
/>
<img width="4624" height="3472" alt="3"
src="https://github.com/user-attachments/assets/5de2fb6d-173d-4ac3-ad1b-e08f27f4dafd"
/>

The code was written / supported with Claude - the approach (e.g. design
/ storing the choice in ViewOptions) endpoint research etc was done by
myself - I reviewed the approaches / refactoring and than deployed a
debug.apk to my local device to confirm everything was working as
expected.

I've reviewed each line and can explain it / the thinking to approaches
/ logic etc and am comfortable submitting the PR.

---------

Co-authored-by: Damontecres <damontecres@gmail.com>
(cherry picked from commit d2713ff)

* Allow play/pause from untrusted media controllers (damontecres#2145)

## Description
- From media3 1.11, controllers that aren't trusted get read-only player
commands by default.
- Google Home sends its commands through
com.google.android.apps.mediashell (Google's Cast service on the TV),
which isn't trusted, so play/pause from it was dropped.
- Logcat showed: MediaSessionLegacyStub: Calling play() omitted due to
COMMAND_PLAY_PAUSE not being available
- The change: a MediaSession.Callback (TrustAllControllersCallback in
PlayerFactory.kt) that gives every controller all player commands again.
It uses onConnectAsync and AcceptedResultBuilder(session, controller),
so untrusted controllers keep the restricted session commands.
- It's applied to the video session (createMediaSession) and the music
session (MusicService).
- It probably started with the media3 1.11 bump in damontecres#1814.

### Related issues
<!-- If this is a new feature or a change, there must be a discussion in
an issue first, reference the issue here -->
<!-- If fixing a bug, reference the bug issue here, or describe the bug,
including steps to reproduce -->
- Fixes damontecres#2087

### Testing
- JMGO N1S 4K, Google TV, Android 14, ExoPlayer.
- Before the fix: play/pause from Google Home did nothing, and logcat
showed the "omitted" warning.
- After the fix: pause and play from Google Home work. Logcat shows each
command reaching handleSetPlayWhenReady, and the warning is gone.
- The TV remote still works.
- I didn't test music playback; leave that out or test it first.

## Screenshots
- None; no UI changes.

## AI or LLM usage
- Claude Code read the logcat output, found the media3 1.11
untrusted-controller change, and wrote TrustAllControllersCallback plus
the two setCallback(...) calls.

(cherry picked from commit 46bf78a)

* Update dependencies (damontecres#2157)

Updates dependencies to max versions still supporting API level 23

(cherry picked from commit 38bd690)

* Fix HDHomeRun Live TV direct playback by including the live stream ID (damontecres#2163)

## Description

I was having trouble playing HDHomeRun channels through Jellyfin in
Wholphin. They started quickly in the official Jellyfin app, but
Wholphin would sometimes spin or fall back when switching channels.

This change includes the live stream ID returned by Jellyfin when
building the Direct Play URL. It also adds a regression test.

### Related issues

Related to damontecres#2014 and possibly damontecres#1903. My testing was with an HDHomeRun; I
haven’t verified the TVHeadend setups in those reports.

### Testing

Tested on a Google TV Streamer with multiple local channels, FAST
channels, and movie playback. The tested content used Direct Play, and
the HDHomeRun tuners were released after stopping.

All 18 playback tests and the formatting check passed after the
requested test cleanup.

## Screenshots

No UI changes.

## AI or LLM usage

I used OpenAI Codex to help investigate the issue, implement the change
in PlaybackViewModel.kt, add the regression test in
PlaybackViewModelTests.kt, and run validation. Codex also helped draft
this description.

(cherry picked from commit 06c1d62)

* Holiday scenes on Who's watching play as light looping videos instead of being drawn live

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Games page code split into smaller files (no changes to how it works)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Home screen code split into smaller files (no changes to how it works)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Video player code split into smaller files (no changes to how it works)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Home split: share the two row caches between files

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Holiday scene recorder always paints (doesn't reuse a cached test result)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Holiday scene recorder shows the test's own result

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Robot check retries GitHub's emulator download, and skips instead of failing when it stays broken

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Holiday scene recorder paints every scene when no names are given

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

---------

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: hawkinslabdev <59891413+hawkinslabdev@users.noreply.github.com>
Co-authored-by: Damontecres <damontecres@gmail.com>
Co-authored-by: Clint Bird <clintjb@gmail.com>
Co-authored-by: Ali Alaei <49282631+aalaei@users.noreply.github.com>
Co-authored-by: coulterj <coulterjohnson@gmail.com>
TheBenPsych added a commit to TheBenPsych/MyStream that referenced this pull request Nov 3, 2026
#230)

* Faster and smoother: smaller updates, right-sized pictures, steadier fast scrolling, games ready sooner, robot check on every build

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Tower speed check-up on the Server page

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Kids can play games rated for everyone; movie games stay off the Kids profile

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Cast to any TV with Chromecast from the phone, and play games away from home

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Request audio focus for video playback so background music pauses (damontecres#2151)

## Description
The video player passes false to setAudioAttributes (since damontecres#1258 I
think), as ExoPlayer never requests audio focus. This will pass `true`.

### Related issues
#447, damontecres#1258.

### Testing
Not tested on a device.

### Screenshots
Not applicable

### AI or LLM usage
None.

---------

Co-authored-by: Damontecres <damontecres@gmail.com>
(cherry picked from commit c45c662)

* Can Select Artist or Album Artist to be displayed on Music > Artists Page (damontecres#2127)

The Music / Artists view currently appears to use the artist metadata
from individual tracks. While at a track level this makes perfect sense,
it can result in a very noisy and fragmented artists view.

For example, an album by Eminem might contain tracks with artists such
as:
- Eminem
- Eminem feat. 50 Cent
- Eminem ft. Rihanna
- Eminem & Dr. Dre

Each of these seem to appear as a separate artist entry (even though
they are all tracks from the same album by Eminem)

This becomes particularly noticeable in large music libraries, where
featured artists, collaborations, remixes, and slightly different artist
metadata ends up resulting in a large number of sparsely populated or
duplicate / strange looking artist entries.

This PR adds an option / toggle to determine which metadata field is
used to populate the artists view. This option sits neatly within the
current artist view settings e.g. Music > Artists > View options >
Artist source
- Artist (current behavior)
- Album Artist (use the album artist metadata instead)

That Artist setting stays as the default choice (so nobody sees a change
unless they pick it) but now gives the option to filter down only to
Album Artists if desired - this choice is saved per library and applies
immediately.

Closes damontecres#1868

I've tested it extensively on an Amazon Fire TV Cube Gen 2 (using the
firetv debug variant) the following manual tests were performed:
- The list changes when you pick Album artist and importantly the
selection survives a full app restart
- It was tested on a large library and can confirm only the Album
Artists remained (e.g. only one Eminem entry remained)

Automated checks were run (testFiretvDebugUnitTest & pre-commit) As well
as two new tests being added to the CollectionFolderViewModelTest.kt:
- For letter counting its checking via the album artist endpoint (and
not the standard one) when the source is set as ALBUM_ARTIST
- When the source is changed via the saveViewOptions its triggering a
load from the album artist endpoint

Please see the screenshots below showing the UI impact / modification:
<img width="4624" height="3472" alt="1"
src="https://github.com/user-attachments/assets/6b53575e-ad15-4f66-b9c0-074657128a1d"
/>
<img width="4624" height="3472" alt="2"
src="https://github.com/user-attachments/assets/528c5766-44d8-43d3-8519-778f5aab7441"
/>
<img width="4624" height="3472" alt="3"
src="https://github.com/user-attachments/assets/5de2fb6d-173d-4ac3-ad1b-e08f27f4dafd"
/>

The code was written / supported with Claude - the approach (e.g. design
/ storing the choice in ViewOptions) endpoint research etc was done by
myself - I reviewed the approaches / refactoring and than deployed a
debug.apk to my local device to confirm everything was working as
expected.

I've reviewed each line and can explain it / the thinking to approaches
/ logic etc and am comfortable submitting the PR.

---------

Co-authored-by: Damontecres <damontecres@gmail.com>
(cherry picked from commit d2713ff)

* Allow play/pause from untrusted media controllers (damontecres#2145)

## Description
- From media3 1.11, controllers that aren't trusted get read-only player
commands by default.
- Google Home sends its commands through
com.google.android.apps.mediashell (Google's Cast service on the TV),
which isn't trusted, so play/pause from it was dropped.
- Logcat showed: MediaSessionLegacyStub: Calling play() omitted due to
COMMAND_PLAY_PAUSE not being available
- The change: a MediaSession.Callback (TrustAllControllersCallback in
PlayerFactory.kt) that gives every controller all player commands again.
It uses onConnectAsync and AcceptedResultBuilder(session, controller),
so untrusted controllers keep the restricted session commands.
- It's applied to the video session (createMediaSession) and the music
session (MusicService).
- It probably started with the media3 1.11 bump in damontecres#1814.

### Related issues
<!-- If this is a new feature or a change, there must be a discussion in
an issue first, reference the issue here -->
<!-- If fixing a bug, reference the bug issue here, or describe the bug,
including steps to reproduce -->
- Fixes damontecres#2087

### Testing
- JMGO N1S 4K, Google TV, Android 14, ExoPlayer.
- Before the fix: play/pause from Google Home did nothing, and logcat
showed the "omitted" warning.
- After the fix: pause and play from Google Home work. Logcat shows each
command reaching handleSetPlayWhenReady, and the warning is gone.
- The TV remote still works.
- I didn't test music playback; leave that out or test it first.

## Screenshots
- None; no UI changes.

## AI or LLM usage
- Claude Code read the logcat output, found the media3 1.11
untrusted-controller change, and wrote TrustAllControllersCallback plus
the two setCallback(...) calls.

(cherry picked from commit 46bf78a)

* Update dependencies (damontecres#2157)

Updates dependencies to max versions still supporting API level 23

(cherry picked from commit 38bd690)

* Fix HDHomeRun Live TV direct playback by including the live stream ID (damontecres#2163)

## Description

I was having trouble playing HDHomeRun channels through Jellyfin in
Wholphin. They started quickly in the official Jellyfin app, but
Wholphin would sometimes spin or fall back when switching channels.

This change includes the live stream ID returned by Jellyfin when
building the Direct Play URL. It also adds a regression test.

### Related issues

Related to damontecres#2014 and possibly damontecres#1903. My testing was with an HDHomeRun; I
haven’t verified the TVHeadend setups in those reports.

### Testing

Tested on a Google TV Streamer with multiple local channels, FAST
channels, and movie playback. The tested content used Direct Play, and
the HDHomeRun tuners were released after stopping.

All 18 playback tests and the formatting check passed after the
requested test cleanup.

## Screenshots

No UI changes.

## AI or LLM usage

I used OpenAI Codex to help investigate the issue, implement the change
in PlaybackViewModel.kt, add the regression test in
PlaybackViewModelTests.kt, and run validation. Codex also helped draft
this description.

(cherry picked from commit 06c1d62)

* Holiday scenes on Who's watching play as light looping videos instead of being drawn live

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Games page code split into smaller files (no changes to how it works)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Home screen code split into smaller files (no changes to how it works)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Video player code split into smaller files (no changes to how it works)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Home split: share the two row caches between files

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Holiday scene recorder always paints (doesn't reuse a cached test result)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Holiday scene recorder shows the test's own result

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Robot check retries GitHub's emulator download, and skips instead of failing when it stays broken

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Holiday scene recorder paints every scene when no names are given

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LFUoFdw1fMmXmWcPTfFevd

* Holiday scene videos recorded

---------

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: hawkinslabdev <59891413+hawkinslabdev@users.noreply.github.com>
Co-authored-by: Damontecres <damontecres@gmail.com>
Co-authored-by: Clint Bird <clintjb@gmail.com>
Co-authored-by: Ali Alaei <49282631+aalaei@users.noreply.github.com>
Co-authored-by: coulterj <coulterjohnson@gmail.com>
Co-authored-by: scene recorder <scenes@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants