zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 00:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: make SoundBankEntryInfo a class without constructors

Browse Source
This commit is contained in:
Jan 2024-02-10 10:01:55 +01:00
parent f7ece105ed
commit 45689a29a1
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.cpp
View File

@ -38,7 +38,6 @@ public:
: m_file_name(fileName), : m_file_name(fileName),
m_stream(stream), m_stream(stream),
m_asset_search_path(assetSearchPath), m_asset_search_path(assetSearchPath),
m_sounds(),
m_current_offset(0), m_current_offset(0),
m_total_size(0), m_total_size(0),
m_entry_section_offset(0), m_entry_section_offset(0),
@ -48,7 +47,7 @@ public:
void AddSound(const std::string& soundFilePath, unsigned int soundId, bool looping, bool streamed) override void AddSound(const std::string& soundFilePath, unsigned int soundId, bool looping, bool streamed) override
{ {
this->m_sounds.push_back({soundFilePath, soundId, looping, streamed}); this->m_sounds.emplace_back(soundFilePath, soundId, looping, streamed);
} }
void GoTo(const int64_t offset) void GoTo(const int64_t offset)
@ -116,8 +115,8 @@ public:
for (auto& sound : m_sounds) for (auto& sound : m_sounds)
{ {
const auto& soundFilePath = sound.filePath; const auto& soundFilePath = sound.m_file_path;
const auto soundId = sound.soundId; const auto soundId = sound.m_sound_id;
size_t soundSize = -1; size_t soundSize = -1;
std::unique_ptr<char[]> soundData; std::unique_ptr<char[]> soundData;
@ -140,7 +139,7 @@ public:
frameCount, frameCount,
frameRateIndex, frameRateIndex,
static_cast<unsigned char>(header.formatChunk.nChannels), static_cast<unsigned char>(header.formatChunk.nChannels),
sound.looping, sound.m_looping,
0, 0,
}; };
@ -171,7 +170,7 @@ public:
decoder->GetFrameCount(), decoder->GetFrameCount(),
frameRateIndex, frameRateIndex,
static_cast<unsigned char>(decoder->GetNumChannels()), static_cast<unsigned char>(decoder->GetNumChannels()),
sound.looping, sound.m_looping,
8, 8,
}; };
@ -191,7 +190,7 @@ public:
} }
auto lastEntry = m_entries.rbegin(); auto lastEntry = m_entries.rbegin();
if (!sound.streamed && lastEntry->frameRateIndex != 6) if (!sound.m_streamed && lastEntry->frameRateIndex != 6)
{ {
std::cout << "WARNING: Loaded sound \"" << soundFilePath std::cout << "WARNING: Loaded sound \"" << soundFilePath
<< "\" should have a framerate of 48000 but doesn't. This sound may not work on all games!" << std::endl; << "\" should have a framerate of 48000 but doesn't. This sound may not work on all games!" << std::endl;
@ -270,12 +269,28 @@ public:
} }
private: private:
struct SoundBankEntryInfo class SoundBankEntryInfo
{ {
std::string filePath; public:
unsigned int soundId; SoundBankEntryInfo()
bool looping; : m_sound_id(0u),
bool streamed; m_looping(false),
m_streamed(false)
{
}
SoundBankEntryInfo(std::string filePath, const unsigned int soundId, const bool looping, const bool streamed)
: m_file_path(std::move(filePath)),
m_sound_id(soundId),
m_looping(looping),
m_streamed(streamed)
{
}
std::string m_file_path;
unsigned int m_sound_id;
bool m_looping;
bool m_streamed;
}; };
std::string m_file_name; std::string m_file_name;