From c152b6d75fea7211ed8a00cc241afe2212e22bd0 Mon Sep 17 00:00:00 2001 From: Lywx Date: Sun, 2 Feb 2025 10:48:24 -0600 Subject: [PATCH] Fixed sequences not getting extracted --- .github/workflows/windows_build.yml | 2 +- src/factories/naudio/v1/AudioTableFactory.cpp | 2 +- src/factories/naudio/v1/SequenceFactory.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index 8f39a87..4f8fe3c 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -18,7 +18,7 @@ jobs: - name: Create Package run: | mkdir torch-release - mv build/x64/Release/torch.exe torch-release/ + mv Debug/torch.exe torch-release/ - name: Upload build uses: actions/upload-artifact@v4 with: diff --git a/src/factories/naudio/v1/AudioTableFactory.cpp b/src/factories/naudio/v1/AudioTableFactory.cpp index 69ebe0d..5f82b8c 100644 --- a/src/factories/naudio/v1/AudioTableFactory.cpp +++ b/src/factories/naudio/v1/AudioTableFactory.cpp @@ -159,7 +159,7 @@ std::optional> AudioTableFactory::parse(std::vector auto parent = AudioContext::tables[AudioTableType::SEQ_TABLE].offset; if(size != 0){ YAML::Node seq; - seq["type"] = "BLOB"; + seq["type"] = "NAUDIO:V1:SEQUENCE"; seq["offset"] = parent + addr; seq["size"] = size; Companion::Instance->AddAsset(seq); diff --git a/src/factories/naudio/v1/SequenceFactory.cpp b/src/factories/naudio/v1/SequenceFactory.cpp index d5c91a8..9e6407b 100644 --- a/src/factories/naudio/v1/SequenceFactory.cpp +++ b/src/factories/naudio/v1/SequenceFactory.cpp @@ -66,7 +66,7 @@ ExportResult NSequenceBinaryExporter::Export(std::ostream &write, std::shared_pt } std::optional> NSequenceFactory::parse(std::vector& buffer, YAML::Node& node) { - auto offset = GetSafeNode(node, "offset"); - auto entry = AudioContext::tables[AudioTableType::SEQ_TABLE]; - return std::make_shared((uint8_t*) entry.buffer.data() + entry.entries[offset].addr, entry.entries[offset].size); + auto size = GetSafeNode(node, "size"); + auto [_, segment] = Decompressor::AutoDecode(node, buffer, size); + return std::make_shared(segment.data, segment.size); }