From 4e6e23c24231aede94272874fe7c38f4de9e84a4 Mon Sep 17 00:00:00 2001 From: Olekoop Date: Wed, 7 Aug 2024 20:42:27 +0200 Subject: [PATCH] LibAudio: Replace Duration with AK::Duration in PlaybackStreamOboe AK::Duration isn't exported into global namespace since commit bf600c8 It basically does the same job as commit 6772d44 --- Userland/Libraries/LibAudio/PlaybackStreamOboe.cpp | 10 +++++----- Userland/Libraries/LibAudio/PlaybackStreamOboe.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Userland/Libraries/LibAudio/PlaybackStreamOboe.cpp b/Userland/Libraries/LibAudio/PlaybackStreamOboe.cpp index a9cd02b9805..4c5c5ded4a9 100644 --- a/Userland/Libraries/LibAudio/PlaybackStreamOboe.cpp +++ b/Userland/Libraries/LibAudio/PlaybackStreamOboe.cpp @@ -49,9 +49,9 @@ public: : m_data_request_callback(move(data_request_callback)) { } - Duration last_sample_time() const + AK::Duration last_sample_time() const { - return Duration::from_seconds(m_last_sample_time.load()); + return AK::Duration::from_seconds(m_last_sample_time.load()); } void set_volume(float volume) { @@ -115,9 +115,9 @@ void PlaybackStreamOboe::set_underrun_callback(Function) // FIXME: Implement this. } -NonnullRefPtr> PlaybackStreamOboe::resume() +NonnullRefPtr> PlaybackStreamOboe::resume() { - auto promise = Core::ThreadedPromise::create(); + auto promise = Core::ThreadedPromise::create(); auto time = MUST(total_time_played()); m_storage->stream()->start(); promise->resolve(move(time)); @@ -141,7 +141,7 @@ NonnullRefPtr> PlaybackStreamOboe::discard_buffer_an return promise; } -ErrorOr PlaybackStreamOboe::total_time_played() +ErrorOr PlaybackStreamOboe::total_time_played() { return m_storage->oboe_callback()->last_sample_time(); } diff --git a/Userland/Libraries/LibAudio/PlaybackStreamOboe.h b/Userland/Libraries/LibAudio/PlaybackStreamOboe.h index be2c810130e..f988537284e 100644 --- a/Userland/Libraries/LibAudio/PlaybackStreamOboe.h +++ b/Userland/Libraries/LibAudio/PlaybackStreamOboe.h @@ -18,11 +18,11 @@ public: virtual void set_underrun_callback(Function) override; - virtual NonnullRefPtr> resume() override; + virtual NonnullRefPtr> resume() override; virtual NonnullRefPtr> drain_buffer_and_suspend() override; virtual NonnullRefPtr> discard_buffer_and_suspend() override; - virtual ErrorOr total_time_played() override; + virtual ErrorOr total_time_played() override; virtual NonnullRefPtr> set_volume(double) override;