Skip to content
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

Jump to bottom

fixed subtitles not clearing properly when switching (again) #1571

Merged
merged 2 commits into from
Mar 27, 2022
Merged

fixed subtitles not clearing properly when switching (again) #1571

merged 2 commits into from
Mar 27, 2022

Conversation

mueslimak3r
Copy link
Member

Changes

  • renamed play(long position, Integer transcodedSubtitle) to play(long position, @Nullable Integer forcedSubtitleIndex)
  • always clear the current subtitles when trying to switch streams. This already done in most cases.
  • refactored how the player knows which subtitle track it should load, and which one is currently loaded.
  • mDefaultSubIndex is the track it should load, it is set right away so we can check what should be loaded
  • mCurrentOptions's SubtitleStreamIndex is what is currently in use. It is set to null until onPrepared() tries to switch subtitle streams. The exception is when burning in subtitles, and in this case it is also set when playback starts (not a new change).
  • reworded the string for loading burnt-in subtitles

Issues
fixes #1566

@nielsvanvelzen nielsvanvelzen added this to In progress in v0.13.3 via automation Mar 27, 2022
@nielsvanvelzen nielsvanvelzen merged commit df01514 into jellyfin:master Mar 27, 2022
v0.13.3 automation moved this from In progress to Done Mar 27, 2022
@mueslimak3r mueslimak3r deleted the subtitle-switching-fix branch March 27, 2022 09:12
@mueslimak3r mueslimak3r mentioned this pull request Apr 1, 2022
Merged
@nielsvanvelzen nielsvanvelzen moved this from Done to Cherrypicked in v0.13.3 Apr 9, 2022
nielsvanvelzen pushed a commit that referenced this pull request Apr 9, 2022
@mueslimak3r @nielsvanvelzen
fixed subtitles not clearing properly when switching (again) (#1571)
5115e11 
* fixed subtitles not clearing properly when switching (again)

* edited a couple comments so they're clearer

(cherry picked from commit df01514)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nielsvanvelzen nielsvanvelzen nielsvanvelzen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
No open projects
v0.13.3
Cherrypicked
Milestone
No milestone
2 participants
@mueslimak3r @nielsvanvelzen