From a9d7e9f6f500c5b45e32b2eee4360af3bb81f87a Mon Sep 17 00:00:00 2001 From: "main()" Date: Tue, 26 Mar 2024 14:53:00 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Davide Beatrici --- src/mumble/AudioInput.cpp | 2 ++ src/mumble/AudioInput.h | 1 + src/mumble/Messages.cpp | 3 ++- src/mumble/PipeWire.cpp | 6 ++---- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp index 85d720d5b15..279d1138b12 100644 --- a/src/mumble/AudioInput.cpp +++ b/src/mumble/AudioInput.cpp @@ -1248,6 +1248,7 @@ void AudioInput::onUserMuteDeafStateChanged() { const ClientUser *user = qobject_cast< ClientUser * >(QObject::sender()); updateUserMuteDeafState(user); } + void AudioInput::updateUserMuteDeafState(const ClientUser *user) { bool bMuted = user->bSuppress || user->bSelfMute; if (bUserIsMuted != bMuted) { @@ -1255,5 +1256,6 @@ void AudioInput::updateUserMuteDeafState(const ClientUser *user) { onUserMutedChanged(); } } + void AudioInput::onUserMutedChanged() { } diff --git a/src/mumble/AudioInput.h b/src/mumble/AudioInput.h index 3b5874d28ad..4ba332b7cad 100644 --- a/src/mumble/AudioInput.h +++ b/src/mumble/AudioInput.h @@ -316,6 +316,7 @@ class AudioInput : public QThread { protected: virtual void onUserMutedChanged(); + public slots: void onUserMuteDeafStateChanged(); }; diff --git a/src/mumble/Messages.cpp b/src/mumble/Messages.cpp index 8f7581b628f..f9ec2d43359 100644 --- a/src/mumble/Messages.cpp +++ b/src/mumble/Messages.cpp @@ -169,10 +169,11 @@ void MainWindow::msgServerSync(const MumbleProto::ServerSync &msg) { connect(user, SIGNAL(muteDeafStateChanged()), this, SLOT(userStateChanged())); connect(user, SIGNAL(prioritySpeakerStateChanged()), this, SLOT(userStateChanged())); connect(user, SIGNAL(recordingStateChanged()), this, SLOT(userStateChanged())); + AudioInputPtr audioIn = Global::get().ai; if (audioIn) { audioIn->updateUserMuteDeafState(user); - QObject::connect(user, &ClientUser::muteDeafStateChanged, &*audioIn, &AudioInput::onUserMuteDeafStateChanged); + QObject::connect(user, &ClientUser::muteDeafStateChanged, audioIn.get(), &AudioInput::onUserMuteDeafStateChanged); } qstiIcon->setToolTip(tr("Mumble: %1").arg(Channel::get(Channel::ROOT_ID)->qsName.toHtmlEscaped())); diff --git a/src/mumble/PipeWire.cpp b/src/mumble/PipeWire.cpp index 00e38f3068e..14317adc480 100644 --- a/src/mumble/PipeWire.cpp +++ b/src/mumble/PipeWire.cpp @@ -311,13 +311,11 @@ void PipeWireEngine::queueBuffer(pw_buffer *buffer) { } } -void PipeWireEngine::setActive(bool active) { +void PipeWireEngine::setActive(const bool active) { pws->pw_thread_loop_lock(m_thread); pws->pw_stream_set_active(m_stream, active); pws->pw_thread_loop_unlock(m_thread); } - - PipeWireInput::PipeWireInput() { m_engine = std::make_unique< PipeWireEngine >("Capture", this, processCallback); if (!m_engine->isOk()) { @@ -368,7 +366,7 @@ void PipeWireInput::run() { } void PipeWireInput::onUserMutedChanged() { if (bUserIsMuted && Global::get().s.bTxMuteCue) { - // do not disable the stream if mute cue is enabled (otherwise mute cue will not work) + // Do not disable the stream if mute cue is enabled (otherwise mute cue will not work). return; }