Merge branch 'ticket/38'

closes #38

Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp

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

Sources/Plasma/PubUtilLib/plAudioCore/plSrtFileReader.cpp

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

Sources/Plasma/PubUtilLib/plAudioCore/plSrtFileReader.h

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