From 052d875f729ddb3fea11adf618f8597a2a935659 Mon Sep 17 00:00:00 2001 From: pgScorpio Date: Fri, 13 Sep 2024 20:43:37 +0200 Subject: [PATCH] Refactor UpdateDisplay() to call UpdateUploadRate() Extracted from: https://github.com/jamulussoftware/jamulus/pull/2550 Related to: https://github.com/jamulussoftware/jamulus/pull/3364/files/21815c1a0708979fe0414c30e0294feaa7632be3#r1759185427 Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> --- src/clientsettingsdlg.cpp | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index 58d51701a7..c7458826fd 100644 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -1063,25 +1063,31 @@ void CClientSettingsDlg::OnSndCrdBufferDelayButtonGroupClicked ( QAbstractButton UpdateDisplay(); } +/// @method +/// @brief Sets upstream rate label to current upload rate if the client is connected, else resets label void CClientSettingsDlg::UpdateUploadRate() { - // update upstream rate information label - lblUpstreamValue->setText ( QString().setNum ( pClient->GetUploadRateKbps() ) ); - lblUpstreamUnit->setText ( "kbps" ); + // update upstream rate information label if needed + if ( pClient->IsConnected() ) + { + lblUpstreamValue->setText ( QString().setNum ( pClient->GetUploadRateKbps() ) ); + lblUpstreamUnit->setText ( "kbps" ); + } + else + { + // clear text labels with client parameters + lblUpstreamValue->setText ( "---" ); + lblUpstreamUnit->setText ( "" ); + } } +/// @method +/// @brief Updates slider controls (settings might have been changed) and upstream rate information label void CClientSettingsDlg::UpdateDisplay() { - // update slider controls (settings might have been changed) UpdateJitterBufferFrame(); UpdateSoundCardFrame(); - - if ( !pClient->IsRunning() ) - { - // clear text labels with client parameters - lblUpstreamValue->setText ( "---" ); - lblUpstreamUnit->setText ( "" ); - } + UpdateUploadRate(); } void CClientSettingsDlg::UpdateDirectoryComboBox()