From c78a8b94c5e727d442fe02cd0c6778ee501e690e Mon Sep 17 00:00:00 2001 From: Elyse Date: Mon, 1 Nov 2021 18:52:22 -0600 Subject: [PATCH] Everywhere: Refactor 'muted' to 'main_mix_muted' in all AudioConnections The 'muted' methods referred to the 'main mix muted' but it wasn't really clear from the name. This change will be useful because in the next commit, a 'self muted' state will be added to each audio client connection. --- Userland/Applets/Audio/main.cpp | 8 ++++---- Userland/Libraries/LibAudio/ClientConnection.cpp | 6 +++--- Userland/Libraries/LibAudio/ClientConnection.h | 4 ++-- Userland/Services/AudioServer/AudioClient.ipc | 2 +- Userland/Services/AudioServer/AudioServer.ipc | 4 ++-- Userland/Services/AudioServer/ClientConnection.cpp | 8 ++++---- Userland/Services/AudioServer/ClientConnection.h | 6 +++--- Userland/Services/AudioServer/Mixer.cpp | 2 +- Userland/Utilities/asctl.cpp | 4 ++-- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Userland/Applets/Audio/main.cpp b/Userland/Applets/Audio/main.cpp index 9b7c7de884..0576454392 100644 --- a/Userland/Applets/Audio/main.cpp +++ b/Userland/Applets/Audio/main.cpp @@ -30,9 +30,9 @@ public: , m_show_percent(Config::read_bool("AudioApplet", "Applet", "ShowPercent", false)) { m_audio_volume = static_cast(m_audio_client->get_main_mix_volume() * 100); - m_audio_muted = m_audio_client->get_muted(); + m_audio_muted = m_audio_client->is_main_mix_muted(); - m_audio_client->on_muted_state_change = [this](bool muted) { + m_audio_client->on_main_mix_muted_state_change = [this](bool muted) { if (m_audio_muted == muted) return; m_mute_box->set_checked(!m_audio_muted); @@ -104,7 +104,7 @@ public: m_mute_box->set_tooltip(m_audio_muted ? "Unmute" : "Mute"); m_mute_box->on_checked = [&](bool is_muted) { m_mute_box->set_tooltip(is_muted ? "Unmute" : "Mute"); - m_audio_client->set_muted(is_muted); + m_audio_client->set_main_mix_muted(is_muted); GUI::Application::the()->hide_tooltip(); }; } @@ -130,7 +130,7 @@ private: return; } if (event.button() == GUI::MouseButton::Secondary) { - m_audio_client->set_muted(!m_audio_muted); + m_audio_client->set_main_mix_muted(!m_audio_muted); update(); } } diff --git a/Userland/Libraries/LibAudio/ClientConnection.cpp b/Userland/Libraries/LibAudio/ClientConnection.cpp index 22581b1511..1261a0d090 100644 --- a/Userland/Libraries/LibAudio/ClientConnection.cpp +++ b/Userland/Libraries/LibAudio/ClientConnection.cpp @@ -45,10 +45,10 @@ void ClientConnection::finished_playing_buffer(i32 buffer_id) on_finish_playing_buffer(buffer_id); } -void ClientConnection::muted_state_changed(bool muted) +void ClientConnection::main_mix_muted_state_changed(bool muted) { - if (on_muted_state_change) - on_muted_state_change(muted); + if (on_main_mix_muted_state_change) + on_main_mix_muted_state_change(muted); } void ClientConnection::main_mix_volume_changed(double volume) diff --git a/Userland/Libraries/LibAudio/ClientConnection.h b/Userland/Libraries/LibAudio/ClientConnection.h index 183710f660..8ac59f64b1 100644 --- a/Userland/Libraries/LibAudio/ClientConnection.h +++ b/Userland/Libraries/LibAudio/ClientConnection.h @@ -24,7 +24,7 @@ public: void async_enqueue(Buffer const&); Function on_finish_playing_buffer; - Function on_muted_state_change; + Function on_main_mix_muted_state_change; Function on_main_mix_volume_change; Function on_client_volume_change; @@ -32,7 +32,7 @@ private: ClientConnection(); virtual void finished_playing_buffer(i32) override; - virtual void muted_state_changed(bool) override; + virtual void main_mix_muted_state_changed(bool) override; virtual void main_mix_volume_changed(double) override; virtual void client_volume_changed(double) override; }; diff --git a/Userland/Services/AudioServer/AudioClient.ipc b/Userland/Services/AudioServer/AudioClient.ipc index 92195413ad..0a6d139467 100644 --- a/Userland/Services/AudioServer/AudioClient.ipc +++ b/Userland/Services/AudioServer/AudioClient.ipc @@ -3,7 +3,7 @@ endpoint AudioClient { finished_playing_buffer(i32 buffer_id) =| - muted_state_changed(bool muted) =| + main_mix_muted_state_changed(bool muted) =| main_mix_volume_changed(double volume) =| client_volume_changed(double volume) =| } diff --git a/Userland/Services/AudioServer/AudioServer.ipc b/Userland/Services/AudioServer/AudioServer.ipc index d0396bad7e..21990774f6 100644 --- a/Userland/Services/AudioServer/AudioServer.ipc +++ b/Userland/Services/AudioServer/AudioServer.ipc @@ -3,8 +3,8 @@ endpoint AudioServer { // Mixer functions - set_muted(bool muted) => () - get_muted() => (bool muted) + set_main_mix_muted(bool muted) => () + is_main_mix_muted() => (bool muted) get_main_mix_volume() => (double volume) set_main_mix_volume(double volume) => () get_self_volume() => (double volume) diff --git a/Userland/Services/AudioServer/ClientConnection.cpp b/Userland/Services/AudioServer/ClientConnection.cpp index 919db82270..5e09395643 100644 --- a/Userland/Services/AudioServer/ClientConnection.cpp +++ b/Userland/Services/AudioServer/ClientConnection.cpp @@ -43,9 +43,9 @@ void ClientConnection::did_finish_playing_buffer(Badge, int b async_finished_playing_buffer(buffer_id); } -void ClientConnection::did_change_muted_state(Badge, bool muted) +void ClientConnection::did_change_main_mix_muted_state(Badge, bool muted) { - async_muted_state_changed(muted); + async_main_mix_muted_state_changed(muted); } void ClientConnection::did_change_main_mix_volume(Badge, double volume) @@ -140,12 +140,12 @@ Messages::AudioServer::GetPlayingBufferResponse ClientConnection::get_playing_bu return id; } -Messages::AudioServer::GetMutedResponse ClientConnection::get_muted() +Messages::AudioServer::IsMainMixMutedResponse ClientConnection::is_main_mix_muted() { return m_mixer.is_muted(); } -void ClientConnection::set_muted(bool muted) +void ClientConnection::set_main_mix_muted(bool muted) { m_mixer.set_muted(muted); } diff --git a/Userland/Services/AudioServer/ClientConnection.h b/Userland/Services/AudioServer/ClientConnection.h index be5458d4e1..bdee772a0e 100644 --- a/Userland/Services/AudioServer/ClientConnection.h +++ b/Userland/Services/AudioServer/ClientConnection.h @@ -27,7 +27,7 @@ public: void did_finish_playing_buffer(Badge, int buffer_id); void did_change_client_volume(Badge, double volume); - void did_change_muted_state(Badge, bool muted); + void did_change_main_mix_muted_state(Badge, bool muted); void did_change_main_mix_volume(Badge, double volume); virtual void die() override; @@ -47,8 +47,8 @@ private: virtual void set_paused(bool) override; virtual void clear_buffer(bool) override; virtual Messages::AudioServer::GetPlayingBufferResponse get_playing_buffer() override; - virtual Messages::AudioServer::GetMutedResponse get_muted() override; - virtual void set_muted(bool) override; + virtual Messages::AudioServer::IsMainMixMutedResponse is_main_mix_muted() override; + virtual void set_main_mix_muted(bool) override; virtual void set_sample_rate(u32 sample_rate) override; virtual Messages::AudioServer::GetSampleRateResponse get_sample_rate() override; diff --git a/Userland/Services/AudioServer/Mixer.cpp b/Userland/Services/AudioServer/Mixer.cpp index 27b6daf1bf..879b38fe24 100644 --- a/Userland/Services/AudioServer/Mixer.cpp +++ b/Userland/Services/AudioServer/Mixer.cpp @@ -161,7 +161,7 @@ void Mixer::set_muted(bool muted) request_setting_sync(); ClientConnection::for_each([muted](ClientConnection& client) { - client.did_change_muted_state({}, muted); + client.did_change_main_mix_muted_state({}, muted); }); } diff --git a/Userland/Utilities/asctl.cpp b/Userland/Utilities/asctl.cpp index 4144f0e310..7303cf89ca 100644 --- a/Userland/Utilities/asctl.cpp +++ b/Userland/Utilities/asctl.cpp @@ -78,7 +78,7 @@ ErrorOr serenity_main(Main::Arguments arguments) break; } case AudioVariable::Mute: { - bool muted = audio_client->get_muted(); + bool muted = audio_client->is_main_mix_muted(); if (human_mode) outln("Muted: {}", muted ? "Yes" : "No"); else @@ -151,7 +151,7 @@ ErrorOr serenity_main(Main::Arguments arguments) } case AudioVariable::Mute: { bool& mute = to_set.value.get(); - audio_client->set_muted(mute); + audio_client->set_main_mix_muted(mute); break; } case AudioVariable::SampleRate: {