diff options
| author | louist103 <35883445+louist103@users.noreply.github.com> | 2024-04-16 20:57:15 -0400 |
|---|---|---|
| committer | louist103 <35883445+louist103@users.noreply.github.com> | 2024-04-16 20:57:35 -0400 |
| commit | 870387e9d2ded57913b9dbc87214c05f1e1e7a04 (patch) | |
| tree | 10f03e8d2b06b30a604491093d5934c146cdb250 | |
| parent | aa710337368e449ca6195c9cf9a72ea93f32dddd (diff) | |
Fix drum crash
| -rw-r--r-- | ZAPD/ZAudio.cpp | 12 | ||||
| -rw-r--r-- | ZAPD/ZAudio.h | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/ZAPD/ZAudio.cpp b/ZAPD/ZAudio.cpp index 9f20592..8c72cdd 100644 --- a/ZAPD/ZAudio.cpp +++ b/ZAPD/ZAudio.cpp @@ -80,13 +80,6 @@ void ZAudio::ParseXML(tinyxml2::XMLElement* reader) } } -void ZAudio::DecodeADPCMSample(SampleEntry* sample) -{ - int16_t buffer[1024 * 128]; - - int16_t* out = &buffer[0]; -} - std::vector<AdsrEnvelope*> ZAudio::ParseEnvelopeData(std::vector<uint8_t> audioBank, std::vector<uint8_t> audioTable, int envelopeOffset, int baseOffset) { std::vector<AdsrEnvelope*> result; @@ -252,9 +245,9 @@ void ZAudio::ParseSoundFont(std::vector<uint8_t> codeData, std::vector<uint8_t> drum.loaded = codeData[samplePtr + 2]; drum.tuning = BitConverter::ToFloatBE(codeData, samplePtr + 8); drum.env = ParseEnvelopeData(codeData, audioTable, BitConverter::ToInt32BE(codeData, samplePtr + 12) + ptr, ptr); + entry.drums.push_back(drum); } - entry.drums.push_back(drum); currentOffset += 4; } @@ -301,8 +294,9 @@ void ZAudio::ParseSoundFont(std::vector<uint8_t> codeData, std::vector<uint8_t> instrument.highNotesSound = ParseSoundFontEntry( codeData, audioTable, audioSampleBank[sampleBankId1], sampleBankId1, currentOffset + 24, ptr); } - + // Interesting audio bug if you put this next line in the if block entry.instruments.push_back(instrument); + } } diff --git a/ZAPD/ZAudio.h b/ZAPD/ZAudio.h index 286c75c..ddd4078 100644 --- a/ZAPD/ZAudio.h +++ b/ZAPD/ZAudio.h @@ -107,7 +107,6 @@ public: void ParseXML(tinyxml2::XMLElement* reader) override; - void DecodeADPCMSample(SampleEntry* sample); std::vector<AdsrEnvelope*> ParseEnvelopeData(std::vector<uint8_t> audioBank, std::vector<uint8_t> audioTable, int envelopeOffset, int baseOffset); |