diff options
| author | louist103 <35883445+louist103@users.noreply.github.com> | 2024-10-04 21:14:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-04 21:14:25 -0400 |
| commit | 215d3c2713f0e2e050cc14695204a18e616f8040 (patch) | |
| tree | 2c2ba7fb552df0dcdac1983340f64e360f27294c /ZAPD/ZAudio.h | |
| parent | b002f28757a7ff9f928a4d9dd1834137edb144bb (diff) | |
Fix sample exporting (#20)
* fix how samples are exported
* cleanups
* forgot to re-add these
Diffstat (limited to 'ZAPD/ZAudio.h')
| -rw-r--r-- | ZAPD/ZAudio.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/ZAPD/ZAudio.h b/ZAPD/ZAudio.h index ddd4078..0c6c087 100644 --- a/ZAPD/ZAudio.h +++ b/ZAPD/ZAudio.h @@ -97,32 +97,29 @@ public: std::vector<std::string> seqNames; std::map<uint32_t, std::string> soundFontNames; - // First Key = Bank ID, Sec Key = LoopDataOffset, Third Key = Sample Data Offset - std::map<uint32_t, std::map<uint32_t, std::map<uint32_t, std::string>>> sampleOffsets; - - // Key = Loop Offset, Value = Sample Offset - std::map<uint32_t, uint32_t> specialLoopSamples; + // First Key = Bank ID, Sec Key = Sample Data Offset. + std::map<uint32_t, std::map<uint32_t, std::string>> sampleOffsets; ZAudio(ZFile* nParent); void ParseXML(tinyxml2::XMLElement* reader) override; - std::vector<AdsrEnvelope*> ParseEnvelopeData(std::vector<uint8_t> audioBank, std::vector<uint8_t> audioTable, + std::vector<AdsrEnvelope*> ParseEnvelopeData(const std::vector<uint8_t>& audioBank, const std::vector<uint8_t>& audioTable, int envelopeOffset, int baseOffset); - SoundFontEntry* ParseSoundFontEntry(std::vector<uint8_t> audioBank, - std::vector<uint8_t> audioTable, + SoundFontEntry* ParseSoundFontEntry(const std::vector<uint8_t>& audioBank, + const std::vector<uint8_t>& audioTable, AudioTableEntry audioSampleBankEntry, int bankIndex, int soundFontOffset, int baseOffset); - SampleEntry* ParseSampleEntry(std::vector<uint8_t> audioBank, std::vector<uint8_t> audioTable, + SampleEntry* ParseSampleEntry(const std::vector<uint8_t>& audioBank, const std::vector<uint8_t>& audioTable, AudioTableEntry audioSampleBankEntry, int bankIndex, int sampleOffset, int baseOffset); - std::vector<AudioTableEntry> ParseAudioTable(std::vector<uint8_t> codeData, int baseOffset); - void ParseSoundFont(std::vector<uint8_t> codeData, std::vector<uint8_t> audioTable, - std::vector<AudioTableEntry> audioSampleBank, AudioTableEntry& entry); + std::vector<AudioTableEntry> ParseAudioTable(const std::vector<uint8_t>& codeData, int baseOffset); + void ParseSoundFont(const std::vector<uint8_t>& codeData, const std::vector<uint8_t>& audioTable, + const std::vector<AudioTableEntry>& audioSampleBank, AudioTableEntry& entry); void ParseRawData() override; |