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

fixed issue with fader group and mute state, added comments, update

Browse source
This commit is contained in:
Volker Fischer 2020-06-20 21:05:27 +02:00
parent 2c0b8a6119
commit 7f9518bceb
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -22,8 +22,10 @@
TODO grouping does not work as expected: TODO grouping does not work as expected:
- vertical space between check boxes should be smaller - vertical space between check boxes should be smaller
- update help text
TODO minimum height of faders (dependent on style) TODO minimum height of faders (dependent on style)
- startup height of main windows should be higher now

9
src/audiomixerboard.cpp
View file

@ -397,7 +397,7 @@ void CChannelFader::SetRemoteFaderIsMute ( const bool bIsMute )
} }
} }
void CChannelFader::SendFaderLevelToServer ( const int iLevel, void CChannelFader::SendFaderLevelToServer ( const int iLevel,
const bool bIsGroupUpdate ) const bool bIsGroupUpdate )
{ {
// if mute flag is set or other channel is on solo, do not apply the new // if mute flag is set or other channel is on solo, do not apply the new
@ -412,6 +412,7 @@ void CChannelFader::SendFaderLevelToServer ( const int iLevel,
bIsGroupUpdate, bIsGroupUpdate,
iLevel - iPreviousFaderLevel ); iLevel - iPreviousFaderLevel );
// update previous fader level since the level has changed
iPreviousFaderLevel = iLevel; iPreviousFaderLevel = iLevel;
} }
} }
@ -441,6 +442,12 @@ void CChannelFader::SetMute ( const bool bState )
{ {
// mute was unchecked, get current fader value and apply // mute was unchecked, get current fader value and apply
emit gainValueChanged ( CalcFaderGain ( GetFaderLevel() ), bIsMyOwnFader, false, 0 ); emit gainValueChanged ( CalcFaderGain ( GetFaderLevel() ), bIsMyOwnFader, false, 0 );
// TODO When mute or solo is activated, the group synchronization does not work anymore.
// To get a smoother experience, we adjust the previous level as soon as the mute is
// again set to off (if we would not do that, on the next move of the fader the other
// faders in the group would jump which is very bad).
iPreviousFaderLevel = GetFaderLevel();
} }
} }
} }