jellyfin/JavascriptSubtitlesOctopus
1
0
Fork 0
mirror of https://github.com/jellyfin/JavascriptSubtitlesOctopus.git synced 2025-02-17 04:17:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make octopus.setDropAnimations(true) mean something

Browse Source 
Cherry-picked from: 971a997951
This commit is contained in:
Vasily 2020-03-24 13:47:46 +03:00 committed by Dmitry Lyzo
parent b5c2154959
commit 2ed7b0016c
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/SubtitleOctopus.cpp
View File

@ -165,11 +165,19 @@ static int _is_animated_tag(char *begin, char *end) {
return 0;
}
static int _is_event_animated(ASS_Event *event) {
static void _remove_tag(char *begin, char *end) {
// overwrite the tag with whitespace so libass won't see it
for (; begin < end; begin++) *begin = ' ';
}
static int _is_event_animated(ASS_Event *event, bool drop_animations) {
// event is complex if it's animated in any way,
// either by having non-empty Effect or
// by having tags (enclosed in '{}' in Text)
if (event->Effect && event->Effect[0] != '\0') return 1;
if (event->Effect && event->Effect[0] != '\0') {
if (!drop_animations) return 1;
event->Effect[0] = '\0';
}
int escaped = 0;
char *tagStart = NULL;
@ -183,13 +191,19 @@ static int _is_event_animated(ASS_Event *event) {
break;
case '}':
if (!escaped && tagStart != NULL) {
if (_is_animated_tag(tagStart, p)) return 1;
if (_is_animated_tag(tagStart, p)) {
if (!drop_animations) return 1;
_remove_tag(tagStart, p);
}
tagStart = NULL;
}
break;
case ';':
if (tagStart != NULL) {
if (_is_animated_tag(tagStart, p)) return 1;
if (_is_animated_tag(tagStart, p)) {
if (!drop_animations) return 1;
_remove_tag(tagStart, p + 1 /* +1 is because we want to drop ';' as well */);
}
}
tagStart = p + 1;
break;
@ -556,7 +570,7 @@ public:
ASS_Event *cur = track->events;
int *animated = m_is_event_animated;
for (int i = 0; i < track->n_events; i++, cur++, animated++) {
*animated = _is_event_animated(cur);
*animated = _is_event_animated(cur, m_drop_animations);
}
}