From 3a9225608a0e223fe77981fdf6222337e0eadc1d Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Sat, 28 Jan 2023 20:12:17 +0000 Subject: [PATCH] LibAudio: Remove `try_` prefix from fallible LoaderPlugin methods --- Userland/Libraries/LibAudio/Loader.cpp | 4 ++-- Userland/Libraries/LibAudio/Loader.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Userland/Libraries/LibAudio/Loader.cpp b/Userland/Libraries/LibAudio/Loader.cpp index 774103ba16..8f0065123b 100644 --- a/Userland/Libraries/LibAudio/Loader.cpp +++ b/Userland/Libraries/LibAudio/Loader.cpp @@ -21,7 +21,7 @@ Loader::Loader(NonnullOwnPtr plugin) { } -Result, LoaderError> Loader::try_create(StringView path) +Result, LoaderError> Loader::create_plugin(StringView path) { { auto plugin = WavLoaderPlugin::create(path); @@ -44,7 +44,7 @@ Result, LoaderError> Loader::try_create(StringView p return LoaderError { "No loader plugin available" }; } -Result, LoaderError> Loader::try_create(Bytes buffer) +Result, LoaderError> Loader::create_plugin(Bytes buffer) { { auto plugin = WavLoaderPlugin::create(buffer); diff --git a/Userland/Libraries/LibAudio/Loader.h b/Userland/Libraries/LibAudio/Loader.h index d351ed3637..08ba0e6f5b 100644 --- a/Userland/Libraries/LibAudio/Loader.h +++ b/Userland/Libraries/LibAudio/Loader.h @@ -65,8 +65,8 @@ protected: class Loader : public RefCounted { public: - static Result, LoaderError> create(StringView path) { return adopt_ref(*new Loader(TRY(try_create(path)))); } - static Result, LoaderError> create(Bytes buffer) { return adopt_ref(*new Loader(TRY(try_create(buffer)))); } + static Result, LoaderError> create(StringView path) { return adopt_ref(*new Loader(TRY(create_plugin(path)))); } + static Result, LoaderError> create(Bytes buffer) { return adopt_ref(*new Loader(TRY(create_plugin(buffer)))); } LoaderSamples get_more_samples(size_t max_samples_to_read_from_input = 128 * KiB) const { return m_plugin->get_more_samples(max_samples_to_read_from_input); } @@ -82,8 +82,8 @@ public: Vector const& pictures() const { return m_plugin->pictures(); }; private: - static Result, LoaderError> try_create(StringView path); - static Result, LoaderError> try_create(Bytes buffer); + static Result, LoaderError> create_plugin(StringView path); + static Result, LoaderError> create_plugin(Bytes buffer); explicit Loader(NonnullOwnPtr);