eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bug fix: do not reset fader level meters if number of clients change

Browse source
This commit is contained in:
Volker Fischer 2020-04-22 21:41:33 +02:00
parent 8bded365d7
commit 5f46774e49
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -17,8 +17,8 @@
* bug fix: audio level changes if Buffer Delay is changed (Ticket #106) * 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 TODO sometimes I cannot see the central server in the server list

7
src/audiomixerboard.cpp
View file

@ -246,9 +246,10 @@ void CChannelFader::Reset()
// init gain value -> maximum value as definition according to server // init gain value -> maximum value as definition according to server
pFader->setValue ( AUD_MIX_FADER_MAX ); pFader->setValue ( AUD_MIX_FADER_MAX );
// reset mute/solo check boxes // reset mute/solo check boxes and level meter
pcbMute->setChecked ( false ); pcbMute->setChecked ( false );
pcbSolo->setChecked ( false ); pcbSolo->setChecked ( false );
plbrChannelLevel->setValue ( 0 );
// clear instrument picture, country flag, tool tips and label text // clear instrument picture, country flag, tool tips and label text
plblLabel->setText ( "" ); plblLabel->setText ( "" );
@ -755,6 +756,7 @@ void CAudioMixerBoard::HideAll()
// before hiding the fader, store its level (if some conditions are fullfilled) // before hiding the fader, store its level (if some conditions are fullfilled)
StoreFaderSettings ( vecpChanFader[i] ); StoreFaderSettings ( vecpChanFader[i] );
vecpChanFader[i]->SetChannelLevel ( 0 );
vecpChanFader[i]->SetDisplayChannelLevel ( false ); vecpChanFader[i]->SetDisplayChannelLevel ( false );
vecpChanFader[i]->Hide(); vecpChanFader[i]->Hide();
} }
@ -831,9 +833,6 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInf
} }
} }
// At some future time a new level will arrive -- ???
vecpChanFader[i]->SetChannelLevel ( 0 );
// set the text in the fader // set the text in the fader
vecpChanFader[i]->SetText ( vecChanInfo[j] ); vecpChanFader[i]->SetText ( vecChanInfo[j] );