From 4e27de21e49900963ffa61cc9c0a676bb028f992 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Wed, 16 Aug 2023 10:57:55 +1000 Subject: clean up a bunch of obselete audio code --- src/audio/stream_info.cpp | 84 ----------------------------------------------- 1 file changed, 84 deletions(-) delete mode 100644 src/audio/stream_info.cpp (limited to 'src/audio/stream_info.cpp') diff --git a/src/audio/stream_info.cpp b/src/audio/stream_info.cpp deleted file mode 100644 index 73dbf91b..00000000 --- a/src/audio/stream_info.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2023 jacqueline - * - * SPDX-License-Identifier: GPL-3.0-only - */ - -#include "stream_info.hpp" -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "esp_heap_caps.h" -#include "result.hpp" -#include "span.hpp" -#include "types.hpp" - -namespace audio { - -RawStream::RawStream(std::size_t size) - : info_(), - buffer_size_(size), - buffer_(reinterpret_cast( - heap_caps_malloc(size, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT))) { - assert(buffer_ != NULL); -} - -RawStream::RawStream(std::size_t size, uint32_t caps) - : info_(), - buffer_size_(size), - buffer_(reinterpret_cast(heap_caps_malloc(size, caps))) { - assert(buffer_ != NULL); -} - -RawStream::~RawStream() { - heap_caps_free(buffer_); -} - -auto RawStream::data() -> cpp::span { - return {buffer_, buffer_size_}; -} - -void InputStream::consume(std::size_t bytes) const { - assert(raw_->info().bytes_in_stream() >= bytes); - auto new_data = - raw_->data().subspan(bytes, raw_->info().bytes_in_stream() - bytes); - std::move(new_data.begin(), new_data.end(), raw_->data().begin()); - raw_->info().bytes_in_stream() = new_data.size_bytes(); -} - -const StreamInfo& InputStream::info() const { - return raw_->info(); -} - -cpp::span InputStream::data() const { - return raw_->data().first(raw_->info().bytes_in_stream()); -} - -void OutputStream::add(std::size_t bytes) const { - assert(raw_->info().bytes_in_stream() + bytes <= raw_->data().size_bytes()); - raw_->info().bytes_in_stream() += bytes; -} - -void OutputStream::prepare(const StreamInfo::Format& new_format, - std::optional length) { - raw_->info().set_format(new_format); - raw_->info().bytes_in_stream() = 0; - raw_->info().total_length_bytes() = length; -} - -const StreamInfo& OutputStream::info() const { - return raw_->info(); -} - -cpp::span OutputStream::data() const { - return raw_->data().subspan(raw_->info().bytes_in_stream()); -} - -} // namespace audio -- cgit v1.2.3