justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-08 15:50:16 +02:00
Code Issues Projects Packages Wiki Activity Actions

Fix strings & ass subtitle default setting

Browse source
This commit is contained in:
Damontecres 2026-04-14 11:42:33 -04:00
parent bcd00065fd
commit ab7c348292
No known key found for this signature in database
4 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
View file

@ -433,7 +433,7 @@ sealed interface AppPreference<Pref, T> {
) )
val AssSubtitleMode = val AssSubtitleMode =
AppChoicePreference<AppPreferences, AssPlaybackMode>( AppChoicePreference<AppPreferences, AssPlaybackMode>(
title = R.string.app_theme, title = R.string.ass_subtitle_playback,
defaultValue = AssPlaybackMode.ASS_LIBASS, defaultValue = AssPlaybackMode.ASS_LIBASS,
getter = { it.playbackPreferences.overrides.assPlaybackMode }, getter = { it.playbackPreferences.overrides.assPlaybackMode },
setter = { prefs, value -> setter = { prefs, value ->

3
app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreferencesSerializer.kt
View file

@ -65,8 +65,7 @@ class AppPreferencesSerializer
directPlayPgs = AppPreference.DirectPlayPgs.defaultValue directPlayPgs = AppPreference.DirectPlayPgs.defaultValue
mediaExtensionsEnabled = mediaExtensionsEnabled =
AppPreference.FfmpegPreference.defaultValue AppPreference.FfmpegPreference.defaultValue
assPlaybackMode = assPlaybackMode = AppPreference.AssSubtitleMode.defaultValue
AppPreference.AssSubtitleMode.defaultValue
}.build() }.build()
mpvOptions = mpvOptions =

8
app/src/main/java/com/github/damontecres/wholphin/services/AppUpgradeHandler.kt
View file

@ -319,5 +319,13 @@ class AppUpgradeHandler
} }
} }
} }
if (previous.isEqualOrBefore(Version.fromString("0.6.2-1-g0"))) {
appPreferences.updateData {
it.updatePlaybackOverrides {
assPlaybackMode = AppPreference.AssSubtitleMode.defaultValue
}
}
}
} }
} }

1
app/src/main/res/values/strings.xml
View file

@ -760,6 +760,7 @@
<string name="ass_subtitle_mode_libass">Direct play with libass</string> <string name="ass_subtitle_mode_libass">Direct play with libass</string>
<string name="ass_subtitle_mode_exoplayer">Direct play with ExoPlayer built-in</string> <string name="ass_subtitle_mode_exoplayer">Direct play with ExoPlayer built-in</string>
<string name="ass_subtitle_mode_transcode">Burn in/transcode on server</string> <string name="ass_subtitle_mode_transcode">Burn in/transcode on server</string>
<string name="ass_subtitle_playback">SSA/ASS subtitle playback</string>
<array name="ass_subtitle_modes"> <array name="ass_subtitle_modes">
<item>@string/ass_subtitle_mode_libass</item> <item>@string/ass_subtitle_mode_libass</item>
<item>@string/ass_subtitle_mode_exoplayer</item> <item>@string/ass_subtitle_mode_exoplayer</item>