playback: Fix subtitle visibility leakage and filter missing episodes by mattsigal · Pull Request #496 · Moonfin-Client/Moonfin-Core

mattsigal · 2026-06-11T14:00:55Z

Pull Request

Summary

This PR resolves two playback issues reported in issue #198:

Subtitle visibility issues where subtitles start invisible on auto-advancing to subsequent episodes due to subtitle visibility state leaking and eager disabling when subtitle selection is null.
The player attempting to play missing/virtual episodes or specials in play queues, causing playback failures or player crashes.

Additionally, it resolves the UI synchronization issue where auto-selected/default subtitles are active during playback, but the subtitle track selector dialog incorrectly highlights "Off" instead of the active track.

Related Issues

Closes [UI] android tv playback issues #198

Type of Change

Changes Made

Playback Core (packages/playback_core):
- Modified PlaybackManager to only disable subtitles when the user or server has explicitly set them to -1 (disabled). When null, the backend is allowed to auto-select and display subtitles.
- Added activeSubtitleTrackIndex getter to PlayerBackend interface.
- Updated subtitleStreamIndex getter in PlaybackManager to query the player backend for the active native subtitle track and map it back to the Jellyfin streamIndex when _subtitleStreamIndex is null (auto-selected). This ensures the UI subtitle selection highlights the currently active track instead of displaying "Off".
MediaKit Player Backend:
- In MediaKitPlayerBackend, reset the native mpv player's subtitle properties (sid to 'auto', secondary-sid to 'no', sub-visibility to 'yes', sub-ass to 'yes') on starting any new playback. This prevents subtitle disable state from leaking from previous tracks.
- Implemented activeSubtitleTrackIndex to query _player.state.track.subtitle and resolve the 1-based native track index.
Other Player Backends:
- Overrode activeSubtitleTrackIndex in Media3PlayerBackend, TizenPlayerBackend, and HtmlVideoBackend to return null (not supported/applicable).
Client App UI & Queuing:
- Filtered play queues constructed in ItemDetailScreen (Season, Episode, and Shuffle playback triggers) to exclude missing episodes and virtual placeholder items using isEligibleNextEpisodeCandidate.
- Filtered adjacent/next-season playback queues in the _nextSeasonItemsProvider in PlaybackModule using isEligibleNextEpisodeCandidate.
Unit Tests:
- Updated outdated migration key checking in audio_migration_test.dart from pref_audio_preference_split_v1 to pref_audio_preference_split_v2 to align with the active implementation and restore 100% test success.

Platform

Testing

Tested on emulator / simulator
Tested on physical device
Manual testing completed
Not tested (explain why):

Test Steps

Play an episode with subtitles enabled/auto-selected. Let the player auto-advance to the next episode. Verify subtitles are immediately visible on the next track.
Open the Subtitle Track selector dialog on the next episode. Verify the dialog highlights the currently active subtitle track, rather than highlighting "Off".
Go to a season containing missing episodes or virtual specials, start playback of a preceding episode, and let it advance. Verify it skips the missing/virtual episodes and plays the next available episode without errors.
Verify that all 42/42 unit tests pass successfully.

Screenshots (if applicable)

N/A

Checklist

Code builds successfully
Code follows project style and conventions
No unnecessary commented-out code
No new warnings introduced

RadicalMuffinMan · 2026-06-11T22:56:42Z

rebase on main

RadicalMuffinMan · 2026-06-11T23:11:16Z


+  int? get activeSubtitleTrackIndex => null;
+
+  Future<int?> getActiveSubtitleTrackIndexAsync() async => null;


Suggested change

Future<int?> getActiveSubtitleTrackIndexAsync() async => null;

dead code not used by anything

RadicalMuffinMan · 2026-06-11T23:12:02Z

+    return null;
+  }
+
+  Future<int?> getSubtitleStreamIndexAsync() async {


116 - 128 can be deleted. dead code not used by anything

RadicalMuffinMan · 2026-06-11T23:12:41Z

+  @override
+  int? get activeSubtitleTrackIndex => null;
+
+  @override


Suggested change

@override

dead code not used by anything

RadicalMuffinMan · 2026-06-11T23:12:54Z

+  int? get activeSubtitleTrackIndex => null;
+
+  @override
+  Future<int?> getActiveSubtitleTrackIndexAsync() async => null;


Suggested change

Future<int?> getActiveSubtitleTrackIndexAsync() async => null;

dead code not used by anything

RadicalMuffinMan · 2026-06-11T23:13:14Z

+  @override
+  int? get activeSubtitleTrackIndex => null;
+
+  @override


Suggested change

@override

dead code not used by anything

RadicalMuffinMan · 2026-06-11T23:13:43Z

+  @override
+  int? get activeSubtitleTrackIndex => null;
+
+  @override


Suggested change

@override

dead code not used by anything

RadicalMuffinMan · 2026-06-11T23:13:52Z

+  int? get activeSubtitleTrackIndex => null;
+
+  @override
+  Future<int?> getActiveSubtitleTrackIndexAsync() async => null;


Suggested change

Future<int?> getActiveSubtitleTrackIndexAsync() async => null;

dead code not used by anything

RadicalMuffinMan · 2026-06-11T23:14:09Z

+  @override
+  int? get activeSubtitleTrackIndex => null;
+
+  @override


Suggested change

@override

RadicalMuffinMan · 2026-06-11T23:14:15Z

+  int? get activeSubtitleTrackIndex => null;
+
+  @override
+  Future<int?> getActiveSubtitleTrackIndexAsync() async => null;


Suggested change

Future<int?> getActiveSubtitleTrackIndexAsync() async => null;

RadicalMuffinMan · 2026-06-11T23:14:50Z

+    return null;
+  }
+
+  @override


1265 - 1288 can be deleted. dead code not used by anything

…ue missing episodes - Prevent subtitle visibility state leaking between tracks on MediaKit backend. - Filter out missing/virtual episodes and specials from play queues. - Asynchronously query native subtitle track to synchronize the UI subtitle track selector when auto-selected. - Fix broken unit tests from audio pref migrations. - Change all player backend classes to extend PlayerBackend instead of implements PlayerBackend to allow clean default property inheritance. - Simplify getActiveSubtitleTrackIndexAsync in MediaKitPlayerBackend to return the activeSubtitleTrackIndex getter directly, removing duplicate native querying block. - Remove redundant activeSubtitleTrackIndex and getActiveSubtitleTrackIndexAsync overrides in html_video_backend_web, html_video_backend_stub, media3_player_backend, and tizen_player_backend. - Clean up unused import in tizen_player_backend.

github-actions Bot added Android iOS Linux macOS Windows labels Jun 11, 2026

mattsigal marked this pull request as draft June 11, 2026 14:08

mattsigal force-pushed the feature/subtitle-visibility-and-missing-episodes-fix branch from 58bd2ff to 38b97b4 Compare June 11, 2026 14:31

mattsigal marked this pull request as ready for review June 11, 2026 14:32

mattsigal force-pushed the feature/subtitle-visibility-and-missing-episodes-fix branch from 38b97b4 to 1a05cb3 Compare June 11, 2026 22:59

RadicalMuffinMan requested changes Jun 11, 2026

View reviewed changes

mattsigal force-pushed the feature/subtitle-visibility-and-missing-episodes-fix branch from 1a05cb3 to 67b2c37 Compare June 11, 2026 23:25

RadicalMuffinMan merged commit 12571d2 into Moonfin-Client:main Jun 11, 2026
4 of 5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

playback: Fix subtitle visibility leakage and filter missing episodes#496

playback: Fix subtitle visibility leakage and filter missing episodes#496
RadicalMuffinMan merged 1 commit into
Moonfin-Client:mainfrom
mattsigal:feature/subtitle-visibility-and-missing-episodes-fix

mattsigal commented Jun 11, 2026 •

edited

Loading

Uh oh!

RadicalMuffinMan commented Jun 11, 2026

Uh oh!

RadicalMuffinMan Jun 11, 2026

Uh oh!

RadicalMuffinMan Jun 11, 2026

Uh oh!

RadicalMuffinMan Jun 11, 2026

Uh oh!

RadicalMuffinMan Jun 11, 2026

Uh oh!

RadicalMuffinMan Jun 11, 2026

Uh oh!

RadicalMuffinMan Jun 11, 2026

Uh oh!

RadicalMuffinMan Jun 11, 2026

Uh oh!

RadicalMuffinMan Jun 11, 2026

Uh oh!

RadicalMuffinMan Jun 11, 2026

Uh oh!

RadicalMuffinMan Jun 11, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants


		int? get activeSubtitleTrackIndex => null;

		Future<int?> getActiveSubtitleTrackIndexAsync() async => null;

Conversation

mattsigal commented Jun 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request

Summary

Related Issues

Type of Change

Changes Made

Platform

Testing

Test Steps

Screenshots (if applicable)

Checklist

Uh oh!

RadicalMuffinMan commented Jun 11, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

mattsigal commented Jun 11, 2026 •

edited

Loading