From 5f46774e49ff570e06bf0333ae6c7498e262a804 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Wed, 22 Apr 2020 21:41:33 +0200 Subject: [PATCH] bug fix: do not reset fader level meters if number of clients change --- ChangeLog | 2 +- src/audiomixerboard.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index faf7cf89..5c1d3a42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,8 +17,8 @@ * bug fix: audio level changes if Buffer Delay is changed (Ticket #106) + * bug fix: do not reset fader level meters if number of clients change -TODO if number of clients change, the fader level meters are reset TODO sometimes I cannot see the central server in the server list diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index 903015ef..c1ca9713 100755 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -246,9 +246,10 @@ void CChannelFader::Reset() // init gain value -> maximum value as definition according to server pFader->setValue ( AUD_MIX_FADER_MAX ); - // reset mute/solo check boxes + // reset mute/solo check boxes and level meter pcbMute->setChecked ( false ); pcbSolo->setChecked ( false ); + plbrChannelLevel->setValue ( 0 ); // clear instrument picture, country flag, tool tips and label text plblLabel->setText ( "" ); @@ -755,6 +756,7 @@ void CAudioMixerBoard::HideAll() // before hiding the fader, store its level (if some conditions are fullfilled) StoreFaderSettings ( vecpChanFader[i] ); + vecpChanFader[i]->SetChannelLevel ( 0 ); vecpChanFader[i]->SetDisplayChannelLevel ( false ); vecpChanFader[i]->Hide(); } @@ -831,9 +833,6 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector& vecChanInf } } - // At some future time a new level will arrive -- ??? - vecpChanFader[i]->SetChannelLevel ( 0 ); - // set the text in the fader vecpChanFader[i]->SetText ( vecChanInfo[j] );