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

lib/xiph: use std::string_view instead of StringView

Browse Source
This commit is contained in:
Max Kellermann 2022-07-04 14:48:45 +02:00
parent 1c30b3d5a1
commit cfd255a014
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/xiph/FlacStreamMetadata.cxx
View File

@ -28,11 +28,12 @@
#include "tag/MixRampParser.hxx" #include "tag/MixRampParser.hxx"
#include "tag/ReplayGainInfo.hxx" #include "tag/ReplayGainInfo.hxx"
#include "tag/ReplayGainParser.hxx" #include "tag/ReplayGainParser.hxx"
#include "util/StringView.hxx"
#include <cassert> #include <cassert>
static StringView using std::string_view_literals::operator""sv;
static std::string_view
ToStringView(const FLAC__StreamMetadata_VorbisComment_Entry &entry) noexcept ToStringView(const FLAC__StreamMetadata_VorbisComment_Entry &entry) noexcept
{ {
return {(const char *)entry.entry, entry.length}; return {(const char *)entry.entry, entry.length};
@ -106,7 +107,7 @@ Scan(const FLAC__StreamMetadata_Picture &picture, TagHandler &handler) noexcept
return; return;
if (picture.mime_type != nullptr && if (picture.mime_type != nullptr &&
StringIsEqual(picture.mime_type, "-->")) "-->"sv == picture.mime_type)
/* this is a URL, not image data */ /* this is a URL, not image data */
return; return;

11
src/lib/xiph/VorbisComments.cxx
View File

@ -26,7 +26,6 @@
#include "tag/VorbisComment.hxx" #include "tag/VorbisComment.hxx"
#include "tag/ReplayGainInfo.hxx" #include "tag/ReplayGainInfo.hxx"
#include "tag/ReplayGainParser.hxx" #include "tag/ReplayGainParser.hxx"
#include "util/StringView.hxx"
#include "decoder/Features.h" #include "decoder/Features.h"
#ifndef HAVE_TREMOR #ifndef HAVE_TREMOR
@ -44,7 +43,7 @@ ForEachUserComment(const vorbis_comment &vc, F &&f)
const size_t n = vc.comments; const size_t n = vc.comments;
for (size_t i = 0; i < n; ++i) for (size_t i = 0; i < n; ++i)
f(StringView{user_comments[i], size_t(comment_lengths[i])}); f(std::string_view{user_comments[i], size_t(comment_lengths[i])});
} }
bool bool
@ -55,8 +54,8 @@ VorbisCommentToReplayGain(ReplayGainInfo &rgi,
bool found = false; bool found = false;
ForEachUserComment(vc, [&](StringView s){ ForEachUserComment(vc, [&](std::string_view s){
if (ParseReplayGainVorbis(rgi, s.data)) if (ParseReplayGainVorbis(rgi, s))
found = true; found = true;
}); });
@ -64,7 +63,7 @@ VorbisCommentToReplayGain(ReplayGainInfo &rgi,
} }
static void static void
vorbis_scan_comment(StringView comment, TagHandler &handler) noexcept vorbis_scan_comment(std::string_view comment, TagHandler &handler) noexcept
{ {
const auto picture_b64 = handler.WantPicture() const auto picture_b64 = handler.WantPicture()
? GetVorbisCommentValue(comment, "METADATA_BLOCK_PICTURE") ? GetVorbisCommentValue(comment, "METADATA_BLOCK_PICTURE")
@ -78,7 +77,7 @@ vorbis_scan_comment(StringView comment, TagHandler &handler) noexcept
void void
VorbisCommentScan(const vorbis_comment &vc, TagHandler &handler) noexcept VorbisCommentScan(const vorbis_comment &vc, TagHandler &handler) noexcept
{ {
ForEachUserComment(vc, [&](StringView s){ ForEachUserComment(vc, [&](std::string_view s){
vorbis_scan_comment(s, handler); vorbis_scan_comment(s, handler);
}); });
} }