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

bug fix: clip state not correctly reset when changing servers

Browse source
This commit is contained in:
Volker Fischer 2020-07-05 16:33:53 +02:00
parent ac06f31e1f
commit b8ed6e9435
2 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -20,18 +20,15 @@
- bug fix: grouping faders in the client should be proportional (see discussion in #202, #419) - bug fix: grouping faders in the client should be proportional (see discussion in #202, #419)
TODO bug fix: incorrect selection of UI language (#408) !!!!!!!!!!!!!!!!!!!!!!!!!!!!! TODO bug fix: incorrect selection of UI language (#408) !!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-> note that for the 3.5.8 bug fix release we went back to the original translation code (e.g. no pt_BR!) -> note that for the 3.5.8 bug fix release we went back to the original translation code (e.g. no pt_BR!)
TODO improve settings management -> move settings class in client/server classes, move actual settings variables
TODO add new register message which contains version and, e.g., max number of clients TODO add new register message which contains version and, e.g., max number of clients
TODO Inconsistency between Input meter and Audio mixer meter #423 TODO Inconsistency between Input meter and Audio mixer meter #423
TODO https://github.com/corrados/jamulus/issues/341#issuecomment-647172946 TODO improve settings management -> move settings class in client/server classes, move actual settings variables
- generate .qm on compile time with lrelease

27
src/levelmeter.cpp
View file

@ -246,27 +246,24 @@ void CLevelMeter::SetValue ( const double dValue )
TimerClip.start(); TimerClip.start();
} }
else if ( !TimerClip.isActive() )
{
switch ( eLevelMeterType )
{
case MT_LED:
vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_BLACK );
break;
case MT_BAR:
case MT_SLIM_BAR:
SetBarMeterStyleAndClipStatus ( eLevelMeterType, false );
break;
}
}
} }
void CLevelMeter::ClipReset() void CLevelMeter::ClipReset()
{ {
if ( eLevelMeterType == MT_LED ) // we manually want to reset the clipping indicator: stop timer and reset
// clipping indicator GUI element
TimerClip.stop();
switch ( eLevelMeterType )
{ {
case MT_LED:
vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_BLACK ); vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_BLACK );
break;
case MT_BAR:
case MT_SLIM_BAR:
SetBarMeterStyleAndClipStatus ( eLevelMeterType, false );
break;
} }
} }