OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-21 12:49:10 +00:00
Code Releases Activity

Don't feed remaining subtitles when audio skips to past the end of last subtitle

Browse Source
This commit is contained in:
ZarothYe
2022-03-11 10:55:44 -06:00
parent 838e3e51ad
commit 40bcaba9d8
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp
View File

@ -115,6 +115,7 @@ void plWin32Sound::Update()
plSrtFileReader* srtReader = buf->GetSrtReader(); plSrtFileReader* srtReader = buf->GetSrtReader();
if (srtReader != nullptr) { if (srtReader != nullptr) {
uint32_t currentTimeMs = (uint32_t)(GetActualTimeSec() * 1000.0f); uint32_t currentTimeMs = (uint32_t)(GetActualTimeSec() * 1000.0f);
if (currentTimeMs <= srtReader->GetLastEntryEndTime()) {
while (plSrtEntry* nextEntry = srtReader->GetNextEntryStartingBeforeTime(currentTimeMs)) { while (plSrtEntry* nextEntry = srtReader->GetNextEntryStartingBeforeTime(currentTimeMs)) {
if (plgAudioSys::AreSubtitlesEnabled()) { if (plgAudioSys::AreSubtitlesEnabled()) {
// add a plSubtitleMsg to go... to whoever is listening (probably the KI) // add a plSubtitleMsg to go... to whoever is listening (probably the KI)
@ -124,6 +125,7 @@ void plWin32Sound::Update()
} }
} }
} }
}
plSound::Update(); plSound::Update();
} }

9
Sources/Plasma/PubUtilLib/plAudioCore/plSrtFileReader.cpp
View File

@ -185,3 +185,12 @@ plSrtEntry* plSrtFileReader::GetNextEntryEndingBeforeTime(uint32_t timeMs)
return nullptr; return nullptr;
} }
uint32_t plSrtFileReader::GetLastEntryEndTime()
{
if (!fEntries.empty()) {
return fEntries.back().GetEndTimeMs();
}
return 0;
}

1
Sources/Plasma/PubUtilLib/plAudioCore/plSrtFileReader.h
View File

@ -95,6 +95,7 @@ public:
void AdvanceToTime(uint32_t timeMs); void AdvanceToTime(uint32_t timeMs);
plSrtEntry* GetNextEntryStartingBeforeTime(uint32_t timeMs); plSrtEntry* GetNextEntryStartingBeforeTime(uint32_t timeMs);
plSrtEntry* GetNextEntryEndingBeforeTime(uint32_t timeMs); plSrtEntry* GetNextEntryEndingBeforeTime(uint32_t timeMs);
uint32_t GetLastEntryEndTime();
protected: protected: