diff options
author | Andreas Kling <kling@serenityos.org> | 2021-04-23 16:46:57 +0200 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-04-23 16:46:57 +0200 |
commit | b91c49364df1683c7fe1191eb02b8d9c331874f6 (patch) | |
tree | a9ea5ff8e4cc8cfcfe75c279551be35793d0ffb3 /Userland/Libraries/LibAudio | |
parent | b3db01e20eeae632cc75df9af8666772bda67091 (diff) | |
download | serenity-b91c49364df1683c7fe1191eb02b8d9c331874f6.zip |
AK: Rename adopt() to adopt_ref()
This makes it more symmetrical with adopt_own() (which is used to
create a NonnullOwnPtr from the result of a naked new.)
Diffstat (limited to 'Userland/Libraries/LibAudio')
-rw-r--r-- | Userland/Libraries/LibAudio/Buffer.h | 4 | ||||
-rw-r--r-- | Userland/Libraries/LibAudio/Loader.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Userland/Libraries/LibAudio/Buffer.h b/Userland/Libraries/LibAudio/Buffer.h index bf9f7bfa30..fda5e0ef9c 100644 --- a/Userland/Libraries/LibAudio/Buffer.h +++ b/Userland/Libraries/LibAudio/Buffer.h @@ -93,11 +93,11 @@ public: static RefPtr<Buffer> from_pcm_stream(InputMemoryStream& stream, ResampleHelper& resampler, int num_channels, int bits_per_sample, int num_samples); static NonnullRefPtr<Buffer> create_with_samples(Vector<Frame>&& samples) { - return adopt(*new Buffer(move(samples))); + return adopt_ref(*new Buffer(move(samples))); } static NonnullRefPtr<Buffer> create_with_anonymous_buffer(Core::AnonymousBuffer buffer, i32 buffer_id, int sample_count) { - return adopt(*new Buffer(move(buffer), buffer_id, sample_count)); + return adopt_ref(*new Buffer(move(buffer), buffer_id, sample_count)); } const Frame* samples() const { return (const Frame*)data(); } diff --git a/Userland/Libraries/LibAudio/Loader.h b/Userland/Libraries/LibAudio/Loader.h index 1e92262079..5cd605934d 100644 --- a/Userland/Libraries/LibAudio/Loader.h +++ b/Userland/Libraries/LibAudio/Loader.h @@ -39,8 +39,8 @@ public: class Loader : public RefCounted<Loader> { public: - static NonnullRefPtr<Loader> create(const StringView& path) { return adopt(*new Loader(path)); } - static NonnullRefPtr<Loader> create(const ByteBuffer& buffer) { return adopt(*new Loader(buffer)); } + static NonnullRefPtr<Loader> create(const StringView& path) { return adopt_ref(*new Loader(path)); } + static NonnullRefPtr<Loader> create(const ByteBuffer& buffer) { return adopt_ref(*new Loader(buffer)); } bool has_error() const { return m_plugin ? m_plugin->has_error() : true; } const char* error_string() const { return m_plugin ? m_plugin->error_string() : "No loader plugin available"; } |