diff --git a/Userland/Libraries/LibAudio/PlaybackStream.h b/Userland/Libraries/LibAudio/PlaybackStream.h index 0162711d9b2..847859ee03c 100644 --- a/Userland/Libraries/LibAudio/PlaybackStream.h +++ b/Userland/Libraries/LibAudio/PlaybackStream.h @@ -52,7 +52,7 @@ public: // // The value provided to the promise resolution will match the `total_time_played()` at the exact moment that // the stream was resumed. - virtual NonnullRefPtr> resume() = 0; + virtual NonnullRefPtr> resume() = 0; // Completes playback of any buffered audio data and then suspends playback and buffering. virtual NonnullRefPtr> drain_buffer_and_suspend() = 0; // Drops any buffered audio data and then suspends playback and buffering. This can used be to stop playback @@ -64,7 +64,7 @@ public: // whenever possible. // // This function should be able to run from any thread safely. - virtual ErrorOr total_time_played() = 0; + virtual ErrorOr total_time_played() = 0; virtual NonnullRefPtr> set_volume(double volume) = 0; }; diff --git a/Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.cpp b/Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.cpp index 88a3d16bee9..56b2d3997b5 100644 --- a/Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.cpp +++ b/Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.cpp @@ -42,14 +42,14 @@ struct AudioTask { Volume, }; - void resolve(Duration time) + void resolve(AK::Duration time) { promise.visit( [](Empty) { VERIFY_NOT_REACHED(); }, [&](NonnullRefPtr>& promise) { promise->resolve(); }, - [&](NonnullRefPtr>& promise) { + [&](NonnullRefPtr>& promise) { promise->resolve(move(time)); }); } @@ -66,7 +66,7 @@ struct AudioTask { } Type type; - Variant>, NonnullRefPtr>> promise; + Variant>, NonnullRefPtr>> promise; Optional data {}; }; @@ -128,9 +128,9 @@ public: }); } - Duration last_sample_time() const + AK::Duration last_sample_time() const { - return Duration::from_milliseconds(m_last_sample_time.load()); + return AK::Duration::from_milliseconds(m_last_sample_time.load()); } private: @@ -182,7 +182,7 @@ private: } if (error == noErr) - task.resolve(Duration::from_milliseconds(last_sample_time)); + task.resolve(AK::Duration::from_milliseconds(last_sample_time)); else task.reject(error); } @@ -248,9 +248,9 @@ void PlaybackStreamAudioUnit::set_underrun_callback(Function) // FIXME: Implement this. } -NonnullRefPtr> PlaybackStreamAudioUnit::resume() +NonnullRefPtr> PlaybackStreamAudioUnit::resume() { - auto promise = Core::ThreadedPromise::create(); + auto promise = Core::ThreadedPromise::create(); AudioTask task { AudioTask::Type::Play, promise }; if (auto result = m_state->queue_task(move(task)); result.is_error()) @@ -281,7 +281,7 @@ NonnullRefPtr> PlaybackStreamAudioUnit::discard_buff return promise; } -ErrorOr PlaybackStreamAudioUnit::total_time_played() +ErrorOr PlaybackStreamAudioUnit::total_time_played() { return m_state->last_sample_time(); } diff --git a/Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.h b/Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.h index 3bb11eb1fa2..c4650147ba8 100644 --- a/Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.h +++ b/Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.h @@ -21,11 +21,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; diff --git a/Userland/Libraries/LibAudio/PlaybackStreamPulseAudio.cpp b/Userland/Libraries/LibAudio/PlaybackStreamPulseAudio.cpp index 89ae851338d..4cb440751d3 100644 --- a/Userland/Libraries/LibAudio/PlaybackStreamPulseAudio.cpp +++ b/Userland/Libraries/LibAudio/PlaybackStreamPulseAudio.cpp @@ -77,9 +77,9 @@ void PlaybackStreamPulseAudio::set_underrun_callback(Function callback) }); } -NonnullRefPtr> PlaybackStreamPulseAudio::resume() +NonnullRefPtr> PlaybackStreamPulseAudio::resume() { - auto promise = Core::ThreadedPromise::create(); + auto promise = Core::ThreadedPromise::create(); TRY_OR_REJECT(m_state->check_is_running(), promise); m_state->enqueue([this, promise]() { TRY_OR_REJECT(m_state->stream()->resume()); @@ -110,11 +110,11 @@ NonnullRefPtr> PlaybackStreamPulseAudio::discard_buf return promise; } -ErrorOr PlaybackStreamPulseAudio::total_time_played() +ErrorOr PlaybackStreamPulseAudio::total_time_played() { if (m_state->stream() != nullptr) return m_state->stream()->total_time_played(); - return Duration::zero(); + return AK::Duration::zero(); } NonnullRefPtr> PlaybackStreamPulseAudio::set_volume(double volume) diff --git a/Userland/Libraries/LibAudio/PlaybackStreamPulseAudio.h b/Userland/Libraries/LibAudio/PlaybackStreamPulseAudio.h index d1671944557..7b6dcc20a82 100644 --- a/Userland/Libraries/LibAudio/PlaybackStreamPulseAudio.h +++ b/Userland/Libraries/LibAudio/PlaybackStreamPulseAudio.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; diff --git a/Userland/Libraries/LibAudio/PulseAudioWrappers.cpp b/Userland/Libraries/LibAudio/PulseAudioWrappers.cpp index 1c51475716c..48d762850c8 100644 --- a/Userland/Libraries/LibAudio/PulseAudioWrappers.cpp +++ b/Userland/Libraries/LibAudio/PulseAudioWrappers.cpp @@ -452,7 +452,7 @@ ErrorOr PulseAudioStream::resume() return {}; } -ErrorOr PulseAudioStream::total_time_played() +ErrorOr PulseAudioStream::total_time_played() { auto locker = m_context->main_loop_locker(); @@ -465,19 +465,19 @@ ErrorOr PulseAudioStream::total_time_played() // last-returned time. If we never call pa_stream_get_time() until after giving // the stream its first samples, the issue never occurs. if (!m_started_playback) - return Duration::zero(); + return AK::Duration::zero(); pa_usec_t time = 0; auto error = pa_stream_get_time(m_stream, &time); if (error == -PA_ERR_NODATA) - return Duration::zero(); + return AK::Duration::zero(); if (error != 0) return Error::from_string_literal("Failed to get time from PulseAudio stream"); if (time > NumericLimits::max()) { warnln("WARNING: Audio time is too large!"); time -= NumericLimits::max(); } - return Duration::from_microseconds(static_cast(time)); + return AK::Duration::from_microseconds(static_cast(time)); } ErrorOr PulseAudioStream::set_volume(double volume) diff --git a/Userland/Libraries/LibAudio/PulseAudioWrappers.h b/Userland/Libraries/LibAudio/PulseAudioWrappers.h index 64e04f1eab9..ed445c89df6 100644 --- a/Userland/Libraries/LibAudio/PulseAudioWrappers.h +++ b/Userland/Libraries/LibAudio/PulseAudioWrappers.h @@ -118,7 +118,7 @@ public: // Uncorks the stream and forces data to be written to the buffers to force playback to // resume as soon as possible. ErrorOr resume(); - ErrorOr total_time_played(); + ErrorOr total_time_played(); ErrorOr set_volume(double volume);