i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made the SRT parser a bit less strict.

Browse Source 
* This allows to parse some SRTs that previously failed.
* Use the more expressive BString::IsEmpty() instead of Length() > 0.
This commit is contained in:
Axel Dörfler
2011-12-22 22:25:06 +01:00
parent 61084e53b5
commit 82a05afe30
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mediaplayer/supplier/SubTitlesSRT.cpp
+4 -1
View File
@@ -45,6 +45,9 @@ SubTitlesSRT::SubTitlesSRT(BFile* file, const char* name)
switch (state) { switch (state) {
case EXPECT_SEQUENCE_NUMBER: case EXPECT_SEQUENCE_NUMBER:
{ {
if (line.IsEmpty())
continue;
line.Trim(); line.Trim();
int32 sequenceNumber = atoi(line.String()); int32 sequenceNumber = atoi(line.String());
if (sequenceNumber != lastSequenceNumber + 1) { if (sequenceNumber != lastSequenceNumber + 1) {
@@ -106,7 +109,7 @@ SubTitlesSRT::SubTitlesSRT(BFile* file, const char* name)
} }
case EXPECT_TEXT: case EXPECT_TEXT:
if (line.Length() == 0) { if (line.IsEmpty()) {
int32 index = _IndexFor(subTitle.startTime); int32 index = _IndexFor(subTitle.startTime);
SubTitle* clone = new(std::nothrow) SubTitle(subTitle); SubTitle* clone = new(std::nothrow) SubTitle(subTitle);
if (clone == NULL || !fSubTitles.AddItem(clone, index)) { if (clone == NULL || !fSubTitles.AddItem(clone, index)) {