AxioDL/amuse
2
0
Fork 0
mirror of https://github.com/AxioDL/amuse.git synced 2025-12-08 13:14:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure all ObjectIDs are unique project-wide

Browse Source
This commit is contained in:
Jack Andersen
2019-02-28 10:34:26 -10:00
parent 9f2bb1b371
commit a4b8946ee2
5 changed files with 98 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/AudioGroup.cpp
View File

@@ -48,7 +48,6 @@ SystemString AudioGroup::getSampleBasePath(SampleId sfxId) const {
std::pair<ObjToken<SampleEntryData>, const unsigned char*> AudioGroup::getSampleData(SampleId sfxId,
const SampleEntry* sample) const {
if (sample->m_data->m_looseData) {
setIdDatabases();
SystemString basePath = getSampleBasePath(sfxId);
const_cast<SampleEntry*>(sample)->loadLooseData(basePath);
return {sample->m_data, sample->m_data->m_looseData.get()};
@@ -58,7 +57,6 @@ std::pair<ObjToken<SampleEntryData>, const unsigned char*> AudioGroup::getSample
SampleFileState AudioGroup::getSampleFileState(SampleId sfxId, const SampleEntry* sample, SystemString* pathOut) const {
if (sample->m_data->m_looseData) {
setIdDatabases();
SystemString basePath = getSampleBasePath(sfxId);
return sample->getFileState(basePath, pathOut);
}
@@ -69,7 +67,6 @@ SampleFileState AudioGroup::getSampleFileState(SampleId sfxId, const SampleEntry
void AudioGroup::patchSampleMetadata(SampleId sfxId, const SampleEntry* sample) const {
if (sample->m_data->m_looseData) {
setIdDatabases();
SystemString basePath = getSampleBasePath(sfxId);
sample->patchSampleMetadata(basePath);
}
@@ -77,14 +74,12 @@ void AudioGroup::patchSampleMetadata(SampleId sfxId, const SampleEntry* sample)
void AudioGroup::makeWAVVersion(SampleId sfxId, const SampleEntry* sample) const {
if (sample->m_data->m_looseData) {
setIdDatabases();
m_sdir._extractWAV(sfxId, *sample->m_data, m_groupPath, sample->m_data->m_looseData.get());
}
}
void AudioGroup::makeCompressedVersion(SampleId sfxId, const SampleEntry* sample) const {
if (sample->m_data->m_looseData) {
setIdDatabases();
m_sdir._extractCompressed(sfxId, *sample->m_data, m_groupPath, sample->m_data->m_looseData.get(), true);
}
}
@@ -187,7 +182,6 @@ static const std::regex DefineSNGEntry(R"(#define\s+SNG(\S+)\s+(\S+))", std::reg
static const std::regex DefineSFXEntry(R"(#define\s+SFX(\S+)\s+(\S+))", std::regex::ECMAScript | std::regex::optimize);
void AudioGroupDatabase::importCHeader(std::string_view header) {
setIdDatabases();
std::match_results<std::string_view::const_iterator> dirMatch;
auto begin = header.cbegin();
auto end = header.cend();
@@ -254,7 +248,6 @@ static void WriteDefineLine(std::string& ret, std::string_view typeStr, std::str
}
std::string AudioGroupDatabase::exportCHeader(std::string_view projectName, std::string_view groupName) const {
setIdDatabases();
std::string ret;
ret +=
"/* Auto-generated Amuse Defines\n"

1
lib/AudioGroupSampleDirectory.cpp
View File

@@ -874,7 +874,6 @@ void AudioGroupSampleDirectory::reloadSampleData(SystemStringView groupPath) {
std::pair<std::vector<uint8_t>, std::vector<uint8_t>>
AudioGroupSampleDirectory::toGCNData(const AudioGroupDatabase& group) const {
constexpr athena::Endian DNAE = athena::Big;
group.setIdDatabases();
athena::io::VectorWriter fo;
athena::io::VectorWriter sfo;