diff --git a/Libraries/LibAudio/AClientConnection.cpp b/Libraries/LibAudio/AClientConnection.cpp index ea18bd8115..4ca4e0d71c 100644 --- a/Libraries/LibAudio/AClientConnection.cpp +++ b/Libraries/LibAudio/AClientConnection.cpp @@ -77,6 +77,14 @@ int AClientConnection::get_playing_buffer() return send_sync()->buffer_id(); } -void AClientConnection::handle(const AudioClient::FinishedPlayingBuffer&) +void AClientConnection::handle(const AudioClient::FinishedPlayingBuffer& message) { + if (on_finish_playing_buffer) + on_finish_playing_buffer(message.buffer_id()); +} + +void AClientConnection::handle(const AudioClient::MutedStateChanged& message) +{ + if (on_muted_state_change) + on_muted_state_change(message.muted()); } diff --git a/Libraries/LibAudio/AClientConnection.h b/Libraries/LibAudio/AClientConnection.h index 87ec1b4eaa..c48b90efa9 100644 --- a/Libraries/LibAudio/AClientConnection.h +++ b/Libraries/LibAudio/AClientConnection.h @@ -29,6 +29,10 @@ public: void set_paused(bool paused); void clear_buffer(bool paused = false); + Function on_finish_playing_buffer; + Function on_muted_state_change; + private: virtual void handle(const AudioClient::FinishedPlayingBuffer&) override; + virtual void handle(const AudioClient::MutedStateChanged&) override; }; diff --git a/Servers/AudioServer/ASClientConnection.cpp b/Servers/AudioServer/ASClientConnection.cpp index e6704db19c..b328b228de 100644 --- a/Servers/AudioServer/ASClientConnection.cpp +++ b/Servers/AudioServer/ASClientConnection.cpp @@ -13,6 +13,15 @@ static HashMap> s_connections; +void ASClientConnection::for_each(Function callback) +{ + NonnullRefPtrVector connections; + for (auto& it : s_connections) + connections.append(*it.value); + for (auto& connection : connections) + callback(connection); +} + ASClientConnection::ASClientConnection(CLocalSocket& client_socket, int client_id, ASMixer& mixer) : ConnectionNG(*this, client_socket, client_id) , m_mixer(mixer) @@ -34,6 +43,11 @@ void ASClientConnection::did_finish_playing_buffer(Badge, int buf post_message(AudioClient::FinishedPlayingBuffer(buffer_id)); } +void ASClientConnection::did_change_muted_state(Badge, bool muted) +{ + post_message(AudioClient::MutedStateChanged(muted)); +} + OwnPtr ASClientConnection::handle(const AudioServer::Greet& message) { set_client_pid(message.client_pid()); diff --git a/Servers/AudioServer/ASClientConnection.h b/Servers/AudioServer/ASClientConnection.h index 4147a231d0..aa67ebc08f 100644 --- a/Servers/AudioServer/ASClientConnection.h +++ b/Servers/AudioServer/ASClientConnection.h @@ -13,10 +13,14 @@ class ASClientConnection final : public IPC::Server::ConnectionNG, int buffer_id); + void did_change_muted_state(Badge, bool muted); virtual void die() override; + static void for_each(Function); + private: virtual OwnPtr handle(const AudioServer::Greet&) override; virtual OwnPtr handle(const AudioServer::GetMainMixVolume&) override; diff --git a/Servers/AudioServer/ASMixer.cpp b/Servers/AudioServer/ASMixer.cpp index 2cd71e8bec..138fb603a7 100644 --- a/Servers/AudioServer/ASMixer.cpp +++ b/Servers/AudioServer/ASMixer.cpp @@ -101,7 +101,12 @@ void ASMixer::mix() void ASMixer::set_muted(bool muted) { + if (m_muted == muted) + return; m_muted = muted; + ASClientConnection::for_each([muted](ASClientConnection& client) { + client.did_change_muted_state({}, muted); + }); } ASBufferQueue::ASBufferQueue(ASClientConnection& client) diff --git a/Servers/AudioServer/AudioClient.ipc b/Servers/AudioServer/AudioClient.ipc index ed9ba77b3a..12aa2d0b92 100644 --- a/Servers/AudioServer/AudioClient.ipc +++ b/Servers/AudioServer/AudioClient.ipc @@ -1,4 +1,5 @@ endpoint AudioClient = 82 { FinishedPlayingBuffer(i32 buffer_id) =| + MutedStateChanged(bool muted) =| }