2
0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-09-01 14:37:25 +00:00

Merge pull request #271 from Jbleezy/main

Fix guess sound filename function
This commit is contained in:
Jan
2024-09-23 09:59:10 +02:00
committed by GitHub

View File

@@ -227,12 +227,12 @@ public:
bool GuessFilenameAndLoadFile(const std::string& filePath, const SoundBankEntryInfo& sound, std::unique_ptr<char[]>& soundData, size_t& soundSize) bool GuessFilenameAndLoadFile(const std::string& filePath, const SoundBankEntryInfo& sound, std::unique_ptr<char[]>& soundData, size_t& soundSize)
{ {
fs::path pathWithExtension = fs::path(filePath).replace_extension(".wav"); fs::path pathWithExtension = fs::path(filePath).concat(".wav");
auto file = m_asset_search_path->Open(pathWithExtension.string()); auto file = m_asset_search_path->Open(pathWithExtension.string());
if (file.IsOpen()) if (file.IsOpen())
return LoadWavFile(file, sound, soundData, soundSize); return LoadWavFile(file, sound, soundData, soundSize);
pathWithExtension = fs::path(filePath).replace_extension(".flac"); pathWithExtension = fs::path(filePath).concat(".flac");
file = m_asset_search_path->Open(pathWithExtension.string()); file = m_asset_search_path->Open(pathWithExtension.string());
if (file.IsOpen()) if (file.IsOpen())
return LoadFlacFile(file, pathWithExtension.string(), sound, soundData, soundSize); return LoadFlacFile(file, pathWithExtension.string(), sound, soundData, soundSize);