From a231fd1c8afedbeb14b0bc77d76bad61db986059 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 2 May 2024 17:06:25 +1000 Subject: Replace cpp::span shim with std::span --- src/codecs/mad.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/codecs/mad.cpp') diff --git a/src/codecs/mad.cpp b/src/codecs/mad.cpp index e44e9922..01b2f721 100644 --- a/src/codecs/mad.cpp +++ b/src/codecs/mad.cpp @@ -74,7 +74,7 @@ auto MadMp3Decoder::OpenStream(std::shared_ptr input, uint32_t offset) while (!eof && !got_header) { eof = buffer_.Refill(input_.get()); - buffer_.ConsumeBytes([&](cpp::span buf) -> size_t { + buffer_.ConsumeBytes([&](std::span buf) -> size_t { mad_stream_buffer(stream_.get(), reinterpret_cast(buf.data()), buf.size_bytes()); @@ -130,7 +130,7 @@ auto MadMp3Decoder::OpenStream(std::shared_ptr input, uint32_t offset) } need_refill = false; - buffer_.ConsumeBytes([&](cpp::span buf) -> size_t { + buffer_.ConsumeBytes([&](std::span buf) -> size_t { mad_stream_buffer(stream_.get(), reinterpret_cast(buf.data()), buf.size()); @@ -156,13 +156,13 @@ auto MadMp3Decoder::OpenStream(std::shared_ptr input, uint32_t offset) return output; } -auto MadMp3Decoder::DecodeTo(cpp::span output) +auto MadMp3Decoder::DecodeTo(std::span output) -> cpp::result { if (current_sample_ < 0 && !is_eos_) { if (!is_eof_) { is_eof_ = buffer_.Refill(input_.get()); if (is_eof_) { - buffer_.AddBytes([&](cpp::span buf) -> size_t { + buffer_.AddBytes([&](std::span buf) -> size_t { if (buf.size() < MAD_BUFFER_GUARD) { is_eof_ = false; return 0; @@ -174,7 +174,7 @@ auto MadMp3Decoder::DecodeTo(cpp::span output) } } - buffer_.ConsumeBytes([&](cpp::span buf) -> size_t { + buffer_.ConsumeBytes([&](std::span buf) -> size_t { mad_stream_buffer(stream_.get(), reinterpret_cast(buf.data()), buf.size()); -- cgit v1.2.3