TagPrint, command/File: two more libfmt 10 workarounds

libfmt 10 doesn't know how to format a StringView, and doesn't cast to std::string_view anymore. The StringView class has been removed from MPD 0.24 completely, and this is a stable-branch-only workaround. Closes https://github.com/MusicPlayerDaemon/MPD/pull/1814

TagPrint, command/File: two more libfmt 10 workarounds
e1e37cfe · Max Kellermann · 38193498 · e1e37cfe · e1e37cfe
Commit e1e37cfe authored May 21, 2023 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

TagPrint.cxx src/TagPrint.cxx +2 -1

FileCommands.cxx src/command/FileCommands.cxx +2 -1

No files found.
--- a/src/TagPrint.cxx
+++ b/src/TagPrint.cxx
@@ -35,8 +35,9 @@ tag_print_types(Response &r) noexcept
 }

 void
-tag_print(Response &r, TagType type, StringView value) noexcept
+tag_print(Response &r, TagType type, StringView _value) noexcept
 {
+	const std::string_view value{_value};
 	r.Fmt(FMT_STRING("{}: {}\n"), tag_item_names[type], value);
 }


--- a/src/command/FileCommands.cxx
+++ b/src/command/FileCommands.cxx
@@ -126,7 +126,8 @@ public:
 	explicit PrintCommentHandler(Response &_response) noexcept
 		:NullTagHandler(WANT_PAIR), response(_response) {}

-	void OnPair(StringView key, StringView value) noexcept override {
+	void OnPair(StringView _key, StringView _value) noexcept override {
+		const std::string_view key{_key}, value{_value};
 		if (IsValidName(key) && IsValidValue(value))
 			response.Fmt(FMT_STRING("{}: {}\n"), key, value);
 	}