1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-19 03:39:08 +00:00

Fix parentheses mistake for retrieving streaming audio timings and apply code fix suggestions from Adam

This commit is contained in:
ZarothYe
2022-02-26 19:16:00 -06:00
parent 64323c6073
commit 126d7511e0
4 changed files with 8 additions and 5 deletions

View File

@ -64,7 +64,7 @@ bool plSrtFileReader::ReadFile()
// if file exists and was opened successfully
if (srtFileStream.Open(path, L"r")) {
plStatusLog::AddLineS("audio.log", "Successfully opened subtitle file {}", path);
plStatusLog::AddLineS("audio.log", "Successfully opened subtitle file %S", path);
uint32_t subtitleNumber = 0;
uint32_t subtitleStartTimeMs = 0;
@ -81,7 +81,7 @@ bool plSrtFileReader::ReadFile()
if (std::regex_match(line, matches, timingsRegex)) {
if (matches.size() < 9) {
// add error message and ensure this subtitle line won't be added to the entries
plStatusLog::AddLineS("audio.log", plStatusLog::kRed, " Subtitle timings '{}' are formatted incorrectly.", line);
plStatusLog::AddLineS("audio.log", plStatusLog::kRed, " Subtitle timings '%s' are formatted incorrectly.", line);
subtitleNumber = 0;
}
else {

View File

@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define _plSrtFileReader_h
#include "hsTypes.h"
#include "../pnUtils/pnUtils.h"
#include <cstdint>
#include <vector>
@ -85,7 +86,8 @@ class plSrtFileReader
public:
plSrtFileReader(const char* audioFileName)
: fAudioFileName(std::move(audioFileName)), fEntries(), fCurrentEntryIndex() { }
: fAudioFileName(StrDup(audioFileName)), fCurrentEntryIndex(0) { }
virtual ~plSrtFileReader() { delete[] fAudioFileName; }
bool ReadFile();
void StartOver() { fCurrentEntryIndex = 0; }