bug fix: sliders move by themselves if fader groups are used on recon…

…nect (#611)
jamulussoftware · Nov 26, 2020 · 39428dd · 39428dd
1 parent b6caa2b
commit 39428dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -12,6 +12,8 @@
 
 - added possibility to set MIDI offset for fader control to --ctrlmidich (#95)
 
+- bug fix: sliders move by themselves if fader groups are used on reconnect (#611)
+
 - bug fix: do not reset sound card channel selection on a device property change
 
 - bug fix: compiling Jamulus 3.6.1 is failing on Debian 9 Linode (#736)
@@ -20,8 +22,6 @@
 
 
 
-TODO sliders move by themselves in 3.5.11 (#611) -> maybe the cause are the groupings of faders, see https://www.facebook.com/groups/619274602254947/permalink/803001740548898/?comment_id=803602367155502&reply_comment_id=803624437153295
-
 TODO use new server icon on Mac server bundle (#737) (on Windows the setup is already fixed)
 
 TODO add Github Issues for the MacOS audio interface changes done on the branch

diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp
@@ -361,6 +361,9 @@ void CChannelFader::SetupFaderTag ( const ESkillLevel eSkillLevel )
 
 void CChannelFader::Reset()
 {
+    // it is important to reset the group index first (#611)
+    iGroupID = INVALID_INDEX;
+
     // general initializations
     SetRemoteFaderIsMute ( false );
 
@@ -396,7 +399,6 @@ void CChannelFader::Reset()
     bIsMutedAtServer     = false;
     iRunningNewClientCnt = 0;
 
-    iGroupID = INVALID_INDEX;
     UpdateGroupIDDependencies();
 }
 
@@ -1189,7 +1191,7 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInf
                                                       bStoredFaderIsMute,
                                                       iGroupID ) )
                         {
-                            vecpChanFader[i]->SetFaderLevel  ( iStoredFaderLevel );
+                            vecpChanFader[i]->SetFaderLevel  ( iStoredFaderLevel, true ); // suppress group update
                             vecpChanFader[i]->SetPanValue    ( iStoredPanValue );
                             vecpChanFader[i]->SetFaderIsSolo ( bStoredFaderIsSolo );
                             vecpChanFader[i]->SetFaderIsMute ( bStoredFaderIsMute );
@@ -1290,7 +1292,7 @@ void CAudioMixerBoard::LoadAllFaderSettings()
                                       bStoredFaderIsMute,
                                       iGroupID ) )
         {
-            vecpChanFader[i]->SetFaderLevel  ( iStoredFaderLevel );
+            vecpChanFader[i]->SetFaderLevel  ( iStoredFaderLevel, true ); // suppress group update
             vecpChanFader[i]->SetPanValue    ( iStoredPanValue );
             vecpChanFader[i]->SetFaderIsSolo ( bStoredFaderIsSolo );
             vecpChanFader[i]->SetFaderIsMute ( bStoredFaderIsMute );