diff --git a/Meta/Lagom/Fuzzers/FuzzFlacLoader.cpp b/Meta/Lagom/Fuzzers/FuzzFlacLoader.cpp index 9e1b19769a..3c651ad3e5 100644 --- a/Meta/Lagom/Fuzzers/FuzzFlacLoader.cpp +++ b/Meta/Lagom/Fuzzers/FuzzFlacLoader.cpp @@ -11,7 +11,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* data, size_t size) { auto flac_data = ByteBuffer::copy(data, size).release_value(); - auto flac_or_error = Audio::FlacLoaderPlugin::try_create(flac_data.bytes()); + auto flac_or_error = Audio::FlacLoaderPlugin::create(flac_data.bytes()); if (flac_or_error.is_error()) return 0; diff --git a/Meta/Lagom/Fuzzers/FuzzMP3Loader.cpp b/Meta/Lagom/Fuzzers/FuzzMP3Loader.cpp index 1dc1cdc3e3..aa4b38e43c 100644 --- a/Meta/Lagom/Fuzzers/FuzzMP3Loader.cpp +++ b/Meta/Lagom/Fuzzers/FuzzMP3Loader.cpp @@ -11,7 +11,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* data, size_t size) { auto flac_data = ByteBuffer::copy(data, size).release_value(); - auto mp3_or_error = Audio::MP3LoaderPlugin::try_create(flac_data.bytes()); + auto mp3_or_error = Audio::MP3LoaderPlugin::create(flac_data.bytes()); if (mp3_or_error.is_error()) return 0; diff --git a/Meta/Lagom/Fuzzers/FuzzWAVLoader.cpp b/Meta/Lagom/Fuzzers/FuzzWAVLoader.cpp index 49ee6c4a32..85b54b051f 100644 --- a/Meta/Lagom/Fuzzers/FuzzWAVLoader.cpp +++ b/Meta/Lagom/Fuzzers/FuzzWAVLoader.cpp @@ -13,7 +13,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* data, size_t size) if (!data) return 0; auto wav_data = ReadonlyBytes { data, size }; - auto wav_or_error = Audio::WavLoaderPlugin::try_create(wav_data); + auto wav_or_error = Audio::WavLoaderPlugin::create(wav_data); if (wav_or_error.is_error()) return 0; diff --git a/Tests/LibAudio/TestFLACSpec.cpp b/Tests/LibAudio/TestFLACSpec.cpp index 64518b8ac3..a03460b80c 100644 --- a/Tests/LibAudio/TestFLACSpec.cpp +++ b/Tests/LibAudio/TestFLACSpec.cpp @@ -21,7 +21,7 @@ struct FlacTest : Test::TestCase { void run() const { - auto result = Audio::FlacLoaderPlugin::try_create(m_path.string()); + auto result = Audio::FlacLoaderPlugin::create(m_path.string()); if (result.is_error()) { FAIL(DeprecatedString::formatted("{} (at {})", result.error().description, result.error().index)); return; diff --git a/Userland/Libraries/LibAudio/FlacLoader.cpp b/Userland/Libraries/LibAudio/FlacLoader.cpp index 2d697a538f..1010e77283 100644 --- a/Userland/Libraries/LibAudio/FlacLoader.cpp +++ b/Userland/Libraries/LibAudio/FlacLoader.cpp @@ -30,7 +30,7 @@ FlacLoaderPlugin::FlacLoaderPlugin(NonnullOwnPtr s { } -Result, LoaderError> FlacLoaderPlugin::try_create(StringView path) +Result, LoaderError> FlacLoaderPlugin::create(StringView path) { auto stream = LOADER_TRY(Core::Stream::BufferedFile::create(LOADER_TRY(Core::Stream::File::open(path, Core::Stream::OpenMode::Read)))); auto loader = make(move(stream)); @@ -40,7 +40,7 @@ Result, LoaderError> FlacLoaderPlugin::try_creat return loader; } -Result, LoaderError> FlacLoaderPlugin::try_create(Bytes buffer) +Result, LoaderError> FlacLoaderPlugin::create(Bytes buffer) { auto stream = LOADER_TRY(Core::Stream::FixedMemoryStream::construct(buffer)); auto loader = make(move(stream)); diff --git a/Userland/Libraries/LibAudio/FlacLoader.h b/Userland/Libraries/LibAudio/FlacLoader.h index fffff5f267..7aba887b2a 100644 --- a/Userland/Libraries/LibAudio/FlacLoader.h +++ b/Userland/Libraries/LibAudio/FlacLoader.h @@ -50,8 +50,8 @@ public: explicit FlacLoaderPlugin(NonnullOwnPtr stream); virtual ~FlacLoaderPlugin() override = default; - static Result, LoaderError> try_create(StringView path); - static Result, LoaderError> try_create(Bytes buffer); + static Result, LoaderError> create(StringView path); + static Result, LoaderError> create(Bytes buffer); virtual LoaderSamples get_more_samples(size_t max_bytes_to_read_from_input = 128 * KiB) override; diff --git a/Userland/Libraries/LibAudio/Loader.cpp b/Userland/Libraries/LibAudio/Loader.cpp index 62e0b72855..774103ba16 100644 --- a/Userland/Libraries/LibAudio/Loader.cpp +++ b/Userland/Libraries/LibAudio/Loader.cpp @@ -24,19 +24,19 @@ Loader::Loader(NonnullOwnPtr plugin) Result, LoaderError> Loader::try_create(StringView path) { { - auto plugin = WavLoaderPlugin::try_create(path); + auto plugin = WavLoaderPlugin::create(path); if (!plugin.is_error()) return NonnullOwnPtr(plugin.release_value()); } { - auto plugin = FlacLoaderPlugin::try_create(path); + auto plugin = FlacLoaderPlugin::create(path); if (!plugin.is_error()) return NonnullOwnPtr(plugin.release_value()); } { - auto plugin = MP3LoaderPlugin::try_create(path); + auto plugin = MP3LoaderPlugin::create(path); if (!plugin.is_error()) return NonnullOwnPtr(plugin.release_value()); } @@ -47,19 +47,19 @@ Result, LoaderError> Loader::try_create(StringView p Result, LoaderError> Loader::try_create(Bytes buffer) { { - auto plugin = WavLoaderPlugin::try_create(buffer); + auto plugin = WavLoaderPlugin::create(buffer); if (!plugin.is_error()) return NonnullOwnPtr(plugin.release_value()); } { - auto plugin = FlacLoaderPlugin::try_create(buffer); + auto plugin = FlacLoaderPlugin::create(buffer); if (!plugin.is_error()) return NonnullOwnPtr(plugin.release_value()); } { - auto plugin = MP3LoaderPlugin::try_create(buffer); + auto plugin = MP3LoaderPlugin::create(buffer); if (!plugin.is_error()) return NonnullOwnPtr(plugin.release_value()); } diff --git a/Userland/Libraries/LibAudio/MP3Loader.cpp b/Userland/Libraries/LibAudio/MP3Loader.cpp index 5f972b1540..85fc0b6272 100644 --- a/Userland/Libraries/LibAudio/MP3Loader.cpp +++ b/Userland/Libraries/LibAudio/MP3Loader.cpp @@ -19,7 +19,7 @@ MP3LoaderPlugin::MP3LoaderPlugin(NonnullOwnPtr str { } -Result, LoaderError> MP3LoaderPlugin::try_create(StringView path) +Result, LoaderError> MP3LoaderPlugin::create(StringView path) { auto stream = LOADER_TRY(Core::Stream::BufferedFile::create(LOADER_TRY(Core::Stream::File::open(path, Core::Stream::OpenMode::Read)))); auto loader = make(move(stream)); @@ -29,7 +29,7 @@ Result, LoaderError> MP3LoaderPlugin::try_create( return loader; } -Result, LoaderError> MP3LoaderPlugin::try_create(Bytes buffer) +Result, LoaderError> MP3LoaderPlugin::create(Bytes buffer) { auto stream = LOADER_TRY(Core::Stream::FixedMemoryStream::construct(buffer)); auto loader = make(move(stream)); diff --git a/Userland/Libraries/LibAudio/MP3Loader.h b/Userland/Libraries/LibAudio/MP3Loader.h index 159eff4d4d..9fcd2a51f4 100644 --- a/Userland/Libraries/LibAudio/MP3Loader.h +++ b/Userland/Libraries/LibAudio/MP3Loader.h @@ -26,8 +26,8 @@ public: explicit MP3LoaderPlugin(NonnullOwnPtr stream); virtual ~MP3LoaderPlugin() = default; - static Result, LoaderError> try_create(StringView path); - static Result, LoaderError> try_create(Bytes buffer); + static Result, LoaderError> create(StringView path); + static Result, LoaderError> create(Bytes buffer); virtual LoaderSamples get_more_samples(size_t max_bytes_to_read_from_input = 128 * KiB) override; diff --git a/Userland/Libraries/LibAudio/WavLoader.cpp b/Userland/Libraries/LibAudio/WavLoader.cpp index 746d6b5529..d96f2f2633 100644 --- a/Userland/Libraries/LibAudio/WavLoader.cpp +++ b/Userland/Libraries/LibAudio/WavLoader.cpp @@ -23,7 +23,7 @@ WavLoaderPlugin::WavLoaderPlugin(NonnullOwnPtr str { } -Result, LoaderError> WavLoaderPlugin::try_create(StringView path) +Result, LoaderError> WavLoaderPlugin::create(StringView path) { auto stream = LOADER_TRY(Core::Stream::BufferedFile::create(LOADER_TRY(Core::Stream::File::open(path, Core::Stream::OpenMode::Read)))); auto loader = make(move(stream)); @@ -33,7 +33,7 @@ Result, LoaderError> WavLoaderPlugin::try_create( return loader; } -Result, LoaderError> WavLoaderPlugin::try_create(Bytes buffer) +Result, LoaderError> WavLoaderPlugin::create(Bytes buffer) { auto stream = LOADER_TRY(Core::Stream::FixedMemoryStream::construct(buffer)); auto loader = make(move(stream)); diff --git a/Userland/Libraries/LibAudio/WavLoader.h b/Userland/Libraries/LibAudio/WavLoader.h index 43df084627..c8f3b44904 100644 --- a/Userland/Libraries/LibAudio/WavLoader.h +++ b/Userland/Libraries/LibAudio/WavLoader.h @@ -30,8 +30,8 @@ static constexpr unsigned const WAVE_FORMAT_EXTENSIBLE = 0xFFFE; // Determined b class WavLoaderPlugin : public LoaderPlugin { public: explicit WavLoaderPlugin(NonnullOwnPtr stream); - static Result, LoaderError> try_create(StringView path); - static Result, LoaderError> try_create(Bytes buffer); + static Result, LoaderError> create(StringView path); + static Result, LoaderError> create(Bytes buffer); virtual LoaderSamples get_more_samples(size_t max_samples_to_read_from_input = 128 * KiB) override;