From a231fd1c8afedbeb14b0bc77d76bad61db986059 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Thu, 2 May 2024 17:06:25 +1000
Subject: Replace cpp::span shim with std::span

---
 src/audio/include/audio_converter.hpp  | 12 ++++++------
 src/audio/include/audio_decoder.hpp    |  2 +-
 src/audio/include/audio_source.hpp     |  2 +-
 src/audio/include/fatfs_source.hpp     |  2 +-
 src/audio/include/readahead_source.hpp |  2 +-
 src/audio/include/resample.hpp         |  8 ++++----
 6 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/audio/include')

diff --git a/src/audio/include/audio_converter.hpp b/src/audio/include/audio_converter.hpp
index 232b5d8e..163c6836 100644
--- a/src/audio/include/audio_converter.hpp
+++ b/src/audio/include/audio_converter.hpp
@@ -33,7 +33,7 @@ class SampleConverter {
   auto SetOutput(std::shared_ptr<IAudioOutput>) -> void;
 
   auto beginStream(std::shared_ptr<TrackInfo>) -> void;
-  auto continueStream(cpp::span<sample::Sample>) -> void;
+  auto continueStream(std::span<sample::Sample>) -> void;
   auto endStream() -> void;
 
  private:
@@ -43,9 +43,9 @@ class SampleConverter {
   auto handleContinueStream(size_t samples_available) -> void;
   auto handleEndStream() -> void;
 
-  auto handleSamples(cpp::span<sample::Sample>) -> size_t;
+  auto handleSamples(std::span<sample::Sample>) -> size_t;
 
-  auto sendToSink(cpp::span<sample::Sample>) -> void;
+  auto sendToSink(std::span<sample::Sample>) -> void;
 
   struct Args {
     std::shared_ptr<TrackInfo>* track;
@@ -57,10 +57,10 @@ class SampleConverter {
   std::unique_ptr<Resampler> resampler_;
 
   StreamBufferHandle_t source_;
-  cpp::span<sample::Sample> input_buffer_;
-  cpp::span<std::byte> input_buffer_as_bytes_;
+  std::span<sample::Sample> input_buffer_;
+  std::span<std::byte> input_buffer_as_bytes_;
 
-  cpp::span<sample::Sample> resampled_buffer_;
+  std::span<sample::Sample> resampled_buffer_;
 
   std::shared_ptr<IAudioOutput> sink_;
   IAudioOutput::Format source_format_;
diff --git a/src/audio/include/audio_decoder.hpp b/src/audio/include/audio_decoder.hpp
index 89f0f43c..8e955f74 100644
--- a/src/audio/include/audio_decoder.hpp
+++ b/src/audio/include/audio_decoder.hpp
@@ -50,7 +50,7 @@ class Decoder {
   std::optional<codecs::ICodec::OutputFormat> current_format_;
   std::optional<IAudioOutput::Format> current_sink_format_;
 
-  cpp::span<sample::Sample> codec_buffer_;
+  std::span<sample::Sample> codec_buffer_;
 };
 
 }  // namespace audio
diff --git a/src/audio/include/audio_source.hpp b/src/audio/include/audio_source.hpp
index b38acd7a..f6a34300 100644
--- a/src/audio/include/audio_source.hpp
+++ b/src/audio/include/audio_source.hpp
@@ -23,7 +23,7 @@ class TaggedStream : public codecs::IStream {
 
   auto tags() -> std::shared_ptr<database::TrackTags>;
 
-  auto Read(cpp::span<std::byte> dest) -> ssize_t override;
+  auto Read(std::span<std::byte> dest) -> ssize_t override;
 
   auto CanSeek() -> bool override;
 
diff --git a/src/audio/include/fatfs_source.hpp b/src/audio/include/fatfs_source.hpp
index 45ab34c6..ce9b4db8 100644
--- a/src/audio/include/fatfs_source.hpp
+++ b/src/audio/include/fatfs_source.hpp
@@ -26,7 +26,7 @@ class FatfsSource : public codecs::IStream {
   FatfsSource(codecs::StreamType, std::unique_ptr<FIL> file);
   ~FatfsSource();
 
-  auto Read(cpp::span<std::byte> dest) -> ssize_t override;
+  auto Read(std::span<std::byte> dest) -> ssize_t override;
 
   auto CanSeek() -> bool override;
 
diff --git a/src/audio/include/readahead_source.hpp b/src/audio/include/readahead_source.hpp
index 3e18a989..74a30e1b 100644
--- a/src/audio/include/readahead_source.hpp
+++ b/src/audio/include/readahead_source.hpp
@@ -30,7 +30,7 @@ class ReadaheadSource : public codecs::IStream {
   ReadaheadSource(tasks::WorkerPool&, std::unique_ptr<codecs::IStream>);
   ~ReadaheadSource();
 
-  auto Read(cpp::span<std::byte> dest) -> ssize_t override;
+  auto Read(std::span<std::byte> dest) -> ssize_t override;
 
   auto CanSeek() -> bool override;
 
diff --git a/src/audio/include/resample.hpp b/src/audio/include/resample.hpp
index a9464cb1..4d48d47f 100644
--- a/src/audio/include/resample.hpp
+++ b/src/audio/include/resample.hpp
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <cstdint>
+#include <span>
 #include <vector>
 
-#include "span.hpp"
 #include "speex/speex_resampler.h"
 
 #include "sample.hpp"
@@ -24,8 +24,8 @@ class Resampler {
 
   ~Resampler();
 
-  auto Process(cpp::span<sample::Sample> input,
-               cpp::span<sample::Sample> output,
+  auto Process(std::span<sample::Sample> input,
+               std::span<sample::Sample> output,
                bool end_of_data) -> std::pair<size_t, size_t>;
 
  private:
@@ -34,4 +34,4 @@ class Resampler {
   uint8_t num_channels_;
 };
 
-}  // namespace audio
\ No newline at end of file
+}  // namespace audio
-- 
cgit v1.2.3