be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' into ps-branch

This commit is contained in:
kapodamy 2019-06-14 12:55:49 -03:00 committed by GitHub
parent ac5e2e0532 171b258d5c
commit 162df5eb6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
View File

@ -297,6 +297,7 @@ public abstract class VideoPlayer extends BasePlayer
return true; return true;
}); });
// Add all available captions
for (int i = 0; i < availableLanguages.size(); i++) { for (int i = 0; i < availableLanguages.size(); i++) {
final String captionLanguage = availableLanguages.get(i); final String captionLanguage = availableLanguages.get(i);
MenuItem captionItem = captionPopupMenu.getMenu().add(captionPopupMenuGroupId, MenuItem captionItem = captionPopupMenu.getMenu().add(captionPopupMenuGroupId,
@ -506,7 +507,7 @@ public abstract class VideoPlayer extends BasePlayer
} }
// Normalize mismatching language strings // Normalize mismatching language strings
final String preferredLanguage = trackSelector.getParameters().preferredTextLanguage; final String preferredLanguage = trackSelector.getPreferredTextLanguage();
// Build UI // Build UI
buildCaptionMenu(availableLanguages); buildCaptionMenu(availableLanguages);
if (trackSelector.getParameters().getRendererDisabled(textRenderer) || if (trackSelector.getParameters().getRendererDisabled(textRenderer) ||