oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/DynamicFifoBuffer: pass std::span to Append()

Browse Source
This commit is contained in:
Max Kellermann 2022-07-11 22:28:31 +02:00
parent 53acf7ae82
commit cd241a93c1
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/encoder/plugins/FlacEncoderPlugin.cxx
View File

@ -85,7 +85,7 @@ private:
[[maybe_unused]] unsigned current_frame, [[maybe_unused]] unsigned current_frame,
void *client_data) noexcept { void *client_data) noexcept {
auto &encoder = *(FlacEncoder *)client_data; auto &encoder = *(FlacEncoder *)client_data;
encoder.output_buffer.Append((const std::byte *)data, bytes); encoder.output_buffer.Append({(const std::byte *)data, bytes});
return FLAC__STREAM_ENCODER_WRITE_STATUS_OK; return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
} }
}; };

2
src/encoder/plugins/NullEncoderPlugin.cxx
View File

@ -30,7 +30,7 @@ public:
/* virtual methods from class Encoder */ /* virtual methods from class Encoder */
void Write(const void *data, size_t length) override { void Write(const void *data, size_t length) override {
buffer.Append((const std::byte *)data, length); buffer.Append({(const std::byte *)data, length});
} }
size_t Read(void *dest, size_t length) override { size_t Read(void *dest, size_t length) override {

4
src/encoder/plugins/ShineEncoderPlugin.cxx
View File

@ -156,7 +156,7 @@ ShineEncoder::WriteChunk(bool flush)
shine_encode_buffer(shine, stereo, &written); shine_encode_buffer(shine, stereo, &written);
if (written > 0) if (written > 0)
output_buffer.Append(out, written); output_buffer.Append({out, std::size_t(written)});
input_pos = 0; input_pos = 0;
} }
@ -199,7 +199,7 @@ ShineEncoder::Flush()
const auto data = (const std::byte *)shine_flush(shine, &written); const auto data = (const std::byte *)shine_flush(shine, &written);
if (written > 0) if (written > 0)
output_buffer.Append(data, written); output_buffer.Append({data, std::size_t(written)});
} }
const EncoderPlugin shine_encoder_plugin = { const EncoderPlugin shine_encoder_plugin = {

6
src/util/DynamicFifoBuffer.hxx
View File

@ -109,9 +109,9 @@ public:
/** /**
* Append data to the buffer, growing it as needed. * Append data to the buffer, growing it as needed.
*/ */
void Append(const_pointer p, size_type n) noexcept { void Append(std::span<const std::byte> src) noexcept {
std::copy_n(p, n, Write(n)); std::copy(src.begin(), src.end(), Write(src.size()));
Append(n); Append(src.size());
} }
protected: protected: