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

output/snapcast/Client: use std::string_view instead of StringView

Browse Source
This commit is contained in:
Max Kellermann 2022-05-24 13:32:26 +02:00
parent 73e2ac4211
commit 843dad19e9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/output/plugins/snapcast/Client.cxx
View File

@ -25,11 +25,11 @@
#include "event/Loop.hxx" #include "event/Loop.hxx"
#include "net/SocketError.hxx" #include "net/SocketError.hxx"
#include "net/UniqueSocketDescriptor.hxx" #include "net/UniqueSocketDescriptor.hxx"
#include "util/StringView.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <cassert> #include <cassert>
#include <cstring> #include <cstring>
#include <string_view>
SnapcastClient::SnapcastClient(SnapcastOutput &_output, SnapcastClient::SnapcastClient(SnapcastOutput &_output,
UniqueSocketDescriptor _fd) noexcept UniqueSocketDescriptor _fd) noexcept
@ -132,16 +132,16 @@ Send(SocketDescriptor s, std::string_view buffer) noexcept
static bool static bool
SendServerSettings(SocketDescriptor s, const PackedBE16 id, SendServerSettings(SocketDescriptor s, const PackedBE16 id,
const SnapcastBase &request, const SnapcastBase &request,
const StringView payload) noexcept const std::string_view payload) noexcept
{ {
const PackedLE32 payload_size = payload.size; const PackedLE32 payload_size = payload.size();
SnapcastBase base{}; SnapcastBase base{};
base.type = uint16_t(SnapcastMessageType::SERVER_SETTINGS); base.type = uint16_t(SnapcastMessageType::SERVER_SETTINGS);
base.id = id; base.id = id;
base.refers_to = request.id; base.refers_to = request.id;
base.sent = ToSnapcastTimestamp(std::chrono::steady_clock::now()); base.sent = ToSnapcastTimestamp(std::chrono::steady_clock::now());
base.size = sizeof(payload_size) + payload.size; base.size = sizeof(payload_size) + payload.size();
return SendT(s, base) && SendT(s, payload_size) && Send(s, payload); return SendT(s, base) && SendT(s, payload_size) && Send(s, payload);
} }
@ -157,10 +157,10 @@ SnapcastClient::SendServerSettings(const SnapcastBase &request) noexcept
static bool static bool
SendCodecHeader(SocketDescriptor s, const PackedBE16 id, SendCodecHeader(SocketDescriptor s, const PackedBE16 id,
const SnapcastBase &request, const SnapcastBase &request,
const StringView codec, const std::string_view codec,
const std::span<const std::byte> payload) noexcept const std::span<const std::byte> payload) noexcept
{ {
const PackedLE32 codec_size = codec.size; const PackedLE32 codec_size = codec.size();
const PackedLE32 payload_size = payload.size(); const PackedLE32 payload_size = payload.size();
SnapcastBase base{}; SnapcastBase base{};
@ -168,7 +168,7 @@ SendCodecHeader(SocketDescriptor s, const PackedBE16 id,
base.id = id; base.id = id;
base.refers_to = request.id; base.refers_to = request.id;
base.sent = ToSnapcastTimestamp(std::chrono::steady_clock::now()); base.sent = ToSnapcastTimestamp(std::chrono::steady_clock::now());
base.size = sizeof(codec_size) + codec.size + base.size = sizeof(codec_size) + codec.size() +
sizeof(payload_size) + payload.size(); sizeof(payload_size) + payload.size();
return SendT(s, base) && return SendT(s, base) &&