From 4bff06c76c223a156a14adc478ab1a9b083fd7b2 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Tue, 23 May 2023 09:12:26 +1000
Subject: Drop himem audio buffers (for now?)

For some reason the spinlocks required now block forever? Very odd.

On the plus side, this turned out to be the issue that was stopping the
audio pipeline from running on the app core.
---
 src/audio/include/pipeline.hpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/audio/include')

diff --git a/src/audio/include/pipeline.hpp b/src/audio/include/pipeline.hpp
index 7a658a38..1fa7da83 100644
--- a/src/audio/include/pipeline.hpp
+++ b/src/audio/include/pipeline.hpp
@@ -8,7 +8,6 @@
 #include "freertos/portmacro.h"
 
 #include "audio_element.hpp"
-#include "himem.hpp"
 #include "stream_info.hpp"
 
 namespace audio {
@@ -25,10 +24,9 @@ class Pipeline {
 
   auto NumInputs() const -> std::size_t;
 
-  auto InStreams(std::vector<MappableRegion<kPipelineBufferSize>>*,
-                 std::vector<RawStream>*) -> void;
+  auto InStreams(std::vector<RawStream>*) -> void;
 
-  auto OutStream(MappableRegion<kPipelineBufferSize>*) -> RawStream;
+  auto OutStream() -> RawStream;
 
   auto GetIterationOrder() -> std::vector<Pipeline*>;
 
@@ -36,7 +34,7 @@ class Pipeline {
   IAudioElement* root_;
   std::vector<std::unique_ptr<Pipeline>> subtrees_;
 
-  HimemAlloc<kPipelineBufferSize> output_buffer_;
+  std::array<std::byte, kPipelineBufferSize> output_buffer_;
   StreamInfo output_info_;
 };
 
-- 
cgit v1.2.3