input/Plugin: pass URI as std::string_view

Author: MaxKellermann

src/RemoteTagCache.cxx

@@ -36,7 +36,7 @@ RemoteTagCache::Lookup(const std::string &uri) noexcept
 		lock.unlock();
 
 		try {
-			item->scanner = InputScanTags(uri.c_str(), *item);
+			item->scanner = InputScanTags(uri, *item);
 			if (!item->scanner) {
 				/* unsupported */
 				lock.lock();

src/command/FileCommands.cxx

@@ -146,7 +146,7 @@ find_stream_art(std::string_view directory, Mutex &mutex)
 		std::string art_file = PathTraitsUTF8::Build(directory, name);
 
 		try {
-			return InputStream::OpenReady(art_file.c_str(), mutex);
+			return InputStream::OpenReady(art_file, mutex);
 		} catch (...) {
 			auto e = std::current_exception();
 			if (!IsFileNotFound(e))

src/command/FingerprintCommands.cxx

@@ -68,7 +68,7 @@ class GetChromaprintCommand final
 	void DecodeFile();
 
 	/* virtual methods from class DecoderClient */
-	InputStreamPtr OpenUri(const char *uri) override;
+	InputStreamPtr OpenUri(std::string_view uri) override;
 	size_t Read(InputStream &is,
 		    std::span<std::byte> dest) noexcept override;
 
@@ -246,14 +246,14 @@ try {
 	if (!path.IsNull())
 		DecodeFile();
 	else
-		DecodeStream(*OpenUri(uri.c_str()));
+		DecodeStream(*OpenUri(uri));
 
 	ChromaprintDecoderClient::Finish();
 } catch (StopDecoder) {
 }
 
 InputStreamPtr
-GetChromaprintCommand::OpenUri(const char *uri2)
+GetChromaprintCommand::OpenUri(std::string_view uri2)
 {
 	if (cancel)
 		throw StopDecoder();

src/decoder/Bridge.cxx

@@ -372,7 +372,7 @@ DecoderBridge::SeekError() noexcept
 }
 
 InputStreamPtr
-DecoderBridge::OpenUri(const char *uri)
+DecoderBridge::OpenUri(std::string_view uri)
 {
 	assert(dc.state == DecoderState::START ||
 	       dc.state == DecoderState::DECODE);

src/decoder/Bridge.hxx

@@ -158,7 +158,7 @@ public:
 	SongTime GetSeekTime() noexcept override;
 	uint64_t GetSeekFrame() noexcept override;
 	void SeekError() noexcept override;
-	InputStreamPtr OpenUri(const char *uri) override;
+	InputStreamPtr OpenUri(std::string_view uri) override;
 	size_t Read(InputStream &is,
 		    std::span<std::byte> dest) noexcept override;
 	void SubmitTimestamp(FloatDuration t) noexcept override;

src/decoder/Client.hxx

@@ -10,6 +10,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <span>
+#include <string_view>
 
 struct AudioFormat;
 struct Tag;
@@ -80,7 +81,7 @@ public:
 	 *
 	 * Throws std::runtime_error on error.
 	 */
-	virtual InputStreamPtr OpenUri(const char *uri) = 0;
+	virtual InputStreamPtr OpenUri(std::string_view uri) = 0;
 
 	/**
 	 * Blocking read from the input stream.

src/decoder/Thread.cxx

@@ -227,7 +227,7 @@ decoder_run_stream_plugin(DecoderBridge &bridge, InputStream &is,
 static DecodeResult
 decoder_run_stream_locked(DecoderBridge &bridge, InputStream &is,
 			  std::unique_lock<Mutex> &lock,
-			  const char *uri)
+			  std::string_view uri)
 {
 	const auto suffix = uri_get_suffix(uri);
 

src/decoder/plugins/WavpackDecoderPlugin.cxx

@@ -11,7 +11,6 @@
 #include "fs/Path.hxx"
 #include "lib/fmt/PathFormatter.hxx"
 #include "lib/fmt/RuntimeError.hxx"
-#include "util/AllocatedString.hxx"
 #include "util/Math.hxx"
 #include "util/ScopeExit.hxx"
 
@@ -407,10 +406,8 @@ static constexpr WavpackStreamReader64 mpd_is_reader = {
 static InputStreamPtr
 wavpack_open_wvc(DecoderClient &client, std::string_view uri)
 {
-	const AllocatedString wvc_url{uri, "c"sv};
-
 	try {
-		return client.OpenUri(wvc_url.c_str());
+		return client.OpenUri(fmt::format("{}c", uri));
 	} catch (...) {
 		return nullptr;
 	}

src/input/InputPlugin.cxx

@@ -9,7 +9,7 @@
 #include <iterator>
 
 bool
-InputPlugin::SupportsUri(const char *uri) const noexcept
+InputPlugin::SupportsUri(std::string_view uri) const noexcept
 {
 	assert(prefixes || protocols);
 	if (prefixes != nullptr) {

src/input/InputPlugin.hxx

@@ -47,7 +47,7 @@ struct InputPlugin {
 	 *
 	 * Throws std::runtime_error on error.
 	 */
-	InputStreamPtr (*open)(const char *uri, Mutex &mutex);
+	InputStreamPtr (*open)(std::string_view uri, Mutex &mutex);
 
 	/**
 	 * return a set of supported protocols
@@ -63,11 +63,11 @@ struct InputPlugin {
 	 *
 	 * @return nullptr if the given URI is not supported.
 	 */
-	std::unique_ptr<RemoteTagScanner> (*scan_tags)(const char *uri,
+	std::unique_ptr<RemoteTagScanner> (*scan_tags)(std::string_view uri,
 						       RemoteTagHandler &handler) = nullptr;
 
 	[[gnu::pure]]
-	bool SupportsUri(const char *uri) const noexcept;
+	bool SupportsUri(std::string_view uri) const noexcept;
 
 	template<typename F>
 	void ForeachSupportedUri(F lambda) const noexcept {