mirror of
https://github.com/yuliskov/SmartTube.git
synced 2026-01-09 15:31:03 -06:00
ttml subtitles: repeated lines fix
This commit is contained in:
@@ -101,11 +101,15 @@ public class SubtitleManager implements TextOutput, OnDataChange {
|
||||
|
||||
for (Cue cue : cues) {
|
||||
// Autogenerated subs repeated lines fix
|
||||
// if (cue.text.toString().endsWith("\n")) {
|
||||
if (Helpers.endsWithAny(cue.text.toString(), "\n", " ")) {
|
||||
String textStr = cue.text.toString();
|
||||
if (Helpers.endsWithAny(textStr, "\n", " ")) { // vtt subs format
|
||||
subsBuffer = cue.text;
|
||||
} else if (textStr.contains("\n")) { // ttml subs format
|
||||
String[] split = textStr.split("\n");
|
||||
CharSequence text = split.length == 2 ? split[1] : cue.text;
|
||||
result.add(new Cue(text)); // sub centered by default
|
||||
} else {
|
||||
CharSequence text = subsBuffer != null ? cue.text.toString().replace(subsBuffer, "") : cue.text;
|
||||
CharSequence text = subsBuffer != null ? textStr.replace(subsBuffer, "") : cue.text;
|
||||
result.add(new Cue(text)); // sub centered by default
|
||||
subsBuffer = null;
|
||||
}
|
||||
|
||||
@@ -60,8 +60,8 @@ android {
|
||||
applicationId "com.liskovsoft.smarttubetv"
|
||||
minSdkVersion project.properties.minSdkVersion
|
||||
targetSdkVersion project.properties.targetSdkVersion
|
||||
versionCode 2088
|
||||
versionName "28.98"
|
||||
versionCode 2089
|
||||
versionName "28.99"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
-keep class com.liskovsoft.smartyoutubetv2.common.app.models.playback.controllers.VideoStateController
|
||||
-keep class com.liskovsoft.smartyoutubetv2.tv.ui.browse.BrowseSectionFragmentFactory
|
||||
-keepnames class com.liskovsoft.smartyoutubetv2.common.app.models.playback.controllers.VideoStateController
|
||||
-keepnames class com.liskovsoft.smartyoutubetv2.tv.ui.browse.BrowseSectionFragmentFactory
|
||||
-keepclassmembers class androidx.room.RoomDatabase {
|
||||
androidx.sqlite.db.SupportSQLiteDatabase mDatabase;
|
||||
<init>(...);
|
||||
|
||||
Reference in New Issue
Block a user