kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-13 22:00:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #949 from Bnyro/master

Browse Source 
fix the default subtitle setting
This commit is contained in:
Bnyro 2022-08-02 11:21:34 +00:00 committed by GitHub
commit f87701e836
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
View File

@ -168,7 +168,7 @@ class PlayerFragment : Fragment() {
private var defRes = ""
private var bufferingGoal = 50000
private var seekBarPreview = false
private var defaultSubtitle = ""
private var defaultSubtitleCode = ""
private var sponsorBlockEnabled = true
private var sponsorBlockNotifications = true
@ -324,13 +324,13 @@ class PlayerFragment : Fragment() {
true
)
defaultSubtitle = PreferenceHelper.getString(
defaultSubtitleCode = PreferenceHelper.getString(
PreferenceKeys.DEFAULT_SUBTITLE,
""
)
if (defaultSubtitle.contains("-")) {
defaultSubtitle = defaultSubtitle.split("-")[0]
if (defaultSubtitleCode.contains("-")) {
defaultSubtitleCode = defaultSubtitleCode.split("-")[0]
}
}
@ -1347,6 +1347,15 @@ class PlayerFragment : Fragment() {
subtitleCodesList += it.code!!
}
// set the default subtitle if available
if (defaultSubtitleCode != "" && subtitleCodesList.contains(defaultSubtitleCode)) {
val newParams = trackSelector.buildUponParameters()
.setPreferredTextLanguage(defaultSubtitleCode)
.setPreferredTextRoleFlags(C.ROLE_FLAG_CAPTION)
trackSelector.setParameters(newParams)
playerBinding.captions.setImageResource(R.drawable.ic_caption)
}
// captions selection dialog
// hide caption selection view if no subtitles available
if (response.subtitles.isEmpty()) playerBinding.captions.visibility = View.GONE
@ -1492,10 +1501,8 @@ class PlayerFragment : Fragment() {
)
.build()
// set the subtitle if default subtitle selected
// control for the track sources like subtitles and audio source
trackSelector = DefaultTrackSelector(requireContext())
if (defaultSubtitle != "") trackSelector.buildUponParameters()
.setPreferredTextLanguage(defaultSubtitle)
exoPlayer = ExoPlayer.Builder(requireContext())
.setMediaSourceFactory(DefaultMediaSourceFactory(dataSourceFactory))

2
app/src/main/res/xml/player_settings.xml
View File

@ -72,7 +72,7 @@
app:title="@string/buffering_goal" />
<ListPreference
android:defaultValue="none"
android:defaultValue=""
android:icon="@drawable/ic_caption"
app:key="default_subtitle"
app:title="@string/default_subtitle_language" />