mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-19 03:39:08 +00:00
Apply code suggestions from rarified
This commit is contained in:
@ -45,6 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
|
||||
#include "hsStream.h"
|
||||
#include "hsUtils.h"
|
||||
#include <cstring>
|
||||
|
||||
#include "plgDispatch.h"
|
||||
#include "hsResMgr.h"
|
||||
@ -134,13 +135,13 @@ static void LoadCallback(void *)
|
||||
buffer->SetAudioReader(reader); // give sound buffer reader, since we may need it later
|
||||
|
||||
plSrtFileReader* srtReader = buffer->GetSrtReader();
|
||||
if (srtReader != nullptr && srtReader->GetCurrentAudioFileName() == srcFilename) {
|
||||
// same file we were playing before, so start the SRT feed over instead of deleting and reloading
|
||||
srtReader->StartOver();
|
||||
} else {
|
||||
std::unique_ptr<plSrtFileReader> newSrtFileReader(new plSrtFileReader(srcFilename));
|
||||
if (newSrtFileReader->ReadFile())
|
||||
buffer->SetSrtReader(newSrtFileReader.release());
|
||||
if (srtReader != nullptr && (strcmp(srtReader->GetCurrentAudioFileName(), srcFilename) == 0)) {
|
||||
// same file we were playing before, so start the SRT feed over instead of deleting and reloading
|
||||
srtReader->StartOver();
|
||||
} else {
|
||||
std::unique_ptr<plSrtFileReader> newSrtFileReader(new plSrtFileReader(srcFilename));
|
||||
if (newSrtFileReader->ReadFile())
|
||||
buffer->SetSrtReader(newSrtFileReader.release());
|
||||
}
|
||||
}
|
||||
else
|
||||
|
Reference in New Issue
Block a user