Fixed merge conflicts

HarbourMasters · Sep 23, 2024 · 0fb2187 · 0fb2187
1 parent a375213
commit 0fb2187
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
@@ -451,7 +451,7 @@ std::vector<AdsrEnvelope> AudioManager::parse_envelope(uint32_t addr, std::vecto
 
 std::vector<Entry> AudioManager::parse_sh_header(std::vector<uint8_t>& data, bool isCTL) {
     LUS::BinaryReader reader(reinterpret_cast<char*>(data.data()), data.size());
-    reader.SetEndianness(LUS::Endianness::Big);
+    reader.SetEndianness(Torch::Endianness::Big);
     int16_t num_entries = reader.ReadInt16();
     uint32_t prev = 0;
     std::vector<Entry> entries;

diff --git a/src/factories/AudioHeaderFactory.cpp b/src/factories/AudioHeaderFactory.cpp
@@ -6,7 +6,7 @@
 #include "audio/AIFCDecode.h"
 #include "spdlog/spdlog.h"
 
-void AudioAIFCExporter::Export(std::ostream& write, std::shared_ptr<IParsedData> data, std::string& entryName, YAML::Node& node, std::string* replacement) {
+ExportResult AudioAIFCExporter::Export(std::ostream& write, std::shared_ptr<IParsedData> data, std::string& entryName, YAML::Node& node, std::string* replacement) {
 
     auto samples = AudioManager::Instance->get_samples();
 
@@ -27,6 +27,8 @@ void AudioAIFCExporter::Export(std::ostream& write, std::shared_ptr<IParsedData>
         file.close();
         SPDLOG_INFO("Exported {}", dpath + "_bank_" + std::to_string(temp) + ".aif");
     }
+
+    return std::nullopt;
 }
 
 std::optional<std::shared_ptr<IParsedData>> AudioHeaderFactory::parse(std::vector<uint8_t>& buffer, YAML::Node& data) {

diff --git a/src/factories/AudioHeaderFactory.h b/src/factories/AudioHeaderFactory.h
@@ -4,9 +4,7 @@
 
 class AudioAIFCExporter : public BaseExporter {
 public:
-    ExportResult Export(std::ostream& write, std::shared_ptr<IParsedData> data, std::string& entryName, YAML::Node& node, std::string* replacement) override {
-        return std::nullopt;
-    }
+    ExportResult Export(std::ostream& write, std::shared_ptr<IParsedData> data, std::string& entryName, YAML::Node& node, std::string* replacement);
 };
 
 class AudioDummyExporter : public BaseExporter {