libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 12:44:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

VIDEO: Fixed subtitle search method

Browse Source
This commit is contained in:
Eugene Sandulenko 2018-05-20 15:34:50 +02:00
parent d9fdaa3fe1
commit f555592e10
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
video/srt_parser.cpp
View File

@ -89,6 +89,19 @@ int SRTEntryComparator(const void *item1, const void *item2) {
return l->start - r->start;
}
int SRTEntryComparatorBSearch(const void *item1, const void *item2) {
const SRTEntry *k = *(const SRTEntry **)item1;
const SRTEntry *i = *(const SRTEntry **)item2;
if (k->start < i->start)
return -1;
if (k->start > i->end - 1)
return 1;
return 0;
}
bool SRTParser::parseFile(const char *fname) {
Common::File f;
@ -188,13 +201,14 @@ bool SRTParser::parseFile(const char *fname) {
Common::String SRTParser::getSubtitle(uint32 timestamp) {
SRTEntry test(0, timestamp, 0, "");
SRTEntry *testptr = &test;
const SRTEntry *entry = (const SRTEntry *)bsearch(&test, _entries.data(), _entries.size(), sizeof(SRTEntry *), &SRTEntryComparator);
const SRTEntry **entry = (const SRTEntry **)bsearch(&testptr, _entries.data(), _entries.size(), sizeof(SRTEntry *), &SRTEntryComparatorBSearch);
if (entry->start >= timestamp && entry->end <= timestamp)
return entry->text;
if (entry == NULL)
return "";
return "";
return (*entry)->text;
}
} // End of namespace Video