playlist/Plugin: remove useless wrapper functions

2 files changed, 4 insertions, 22 deletions

diff --git a/src/playlist/PlaylistPlugin.hxx b/src/playlist/PlaylistPlugin.hxx
index d88294852..d3f9d5281 100644
--- a/src/playlist/PlaylistPlugin.hxx
+++ b/src/playlist/PlaylistPlugin.hxx
@@ -96,18 +96,4 @@ playlist_plugin_finish(const struct playlist_plugin *plugin)
 		plugin->finish();
 }
 
-static inline SongEnumerator *
-playlist_plugin_open_uri(const struct playlist_plugin *plugin, const char *uri,
-			 Mutex &mutex, Cond &cond)
-{
-	return plugin->open_uri(uri, mutex, cond);
-}
-
-static inline SongEnumerator *
-playlist_plugin_open_stream(const struct playlist_plugin *plugin,
-			    InputStreamPtr &&is)
-{
-	return plugin->open_stream(std::move(is));
-}
-
 #endif
diff --git a/src/playlist/PlaylistRegistry.cxx b/src/playlist/PlaylistRegistry.cxx
index 98894bba8..d489f3734 100644
--- a/src/playlist/PlaylistRegistry.cxx
+++ b/src/playlist/PlaylistRegistry.cxx
@@ -121,8 +121,7 @@ playlist_list_open_uri_scheme(const char *uri, Mutex &mutex, Cond &cond,
 		if (playlist_plugins_enabled[i] && plugin->open_uri != nullptr &&
 		    plugin->schemes != nullptr &&
 		    StringArrayContainsCase(plugin->schemes, scheme.c_str())) {
-			playlist = playlist_plugin_open_uri(plugin, uri,
-							    mutex, cond);
+			playlist = plugin->open_uri(uri, mutex, cond);
 			if (playlist != nullptr)
 				break;
 
@@ -152,8 +151,7 @@ playlist_list_open_uri_suffix(const char *uri, Mutex &mutex, Cond &cond,
 		if (playlist_plugins_enabled[i] && !tried[i] &&
 		    plugin->open_uri != nullptr && plugin->suffixes != nullptr &&
 		    StringArrayContainsCase(plugin->suffixes, suffix)) {
-			playlist = playlist_plugin_open_uri(plugin, uri,
-							    mutex, cond);
+			playlist = plugin->open_uri(uri, mutex, cond);
 			if (playlist != nullptr)
 				break;
 		}
@@ -197,8 +195,7 @@ playlist_list_open_stream_mime2(InputStreamPtr &&is, const char *mime)
 			} catch (...) {
 			}
 
-			auto playlist = playlist_plugin_open_stream(plugin,
-								    std::move(is));
+			auto playlist = plugin->open_stream(std::move(is));
 			if (playlist != nullptr)
 				return playlist;
 		}
@@ -241,8 +238,7 @@ playlist_list_open_stream_suffix(InputStreamPtr &&is, const char *suffix)
 			} catch (...) {
 			}
 
-			auto playlist = playlist_plugin_open_stream(plugin,
-								    std::move(is));
+			auto playlist = plugin->open_stream(std::move(is));
 			if (playlist != nullptr)
 				return playlist;
 		}