bug fix: do not reset sound card channel selection on a device proper…

…ty change

ChangeLog

@@ -12,6 +12,8 @@
 
 - added possibility to set MIDI offset for fader control to --ctrlmidich (#95)
 
+- 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)
 
 - bug fix: on MacOS Jamulus does not always select the previous sound card (#680)

mac/sound.cpp

@@ -331,16 +331,22 @@ QString CSound::LoadAndInitializeDriver ( QString strDriverName, bool )
     {
         // store ID of selected driver if initialization was successful
         lCurDev                    = iDriverIdx;
-        strCurDevName              = strDriverNames[iDriverIdx];
         CurrentAudioInputDeviceID  = audioInputDevice[iDriverIdx];
         CurrentAudioOutputDeviceID = audioOutputDevice[iDriverIdx];
 
-        // the device has changed, per definition we reset the channel
-        // mapping to the defaults (first two available channels)
-        SetLeftInputChannel   ( 0 );
-        SetRightInputChannel  ( 1 );
-        SetLeftOutputChannel  ( 0 );
-        SetRightOutputChannel ( 1 );
+        // only reset the channel mapping if a new device was selected
+        if ( strCurDevName.compare ( strDriverNames[iDriverIdx] ) != 0 )
+        {
+            // the device has changed, per definition we reset the channel
+            // mapping to the defaults (first two available channels)
+            SetLeftInputChannel   ( 0 );
+            SetRightInputChannel  ( 1 );
+            SetLeftOutputChannel  ( 0 );
+            SetRightOutputChannel ( 1 );
+
+            // store the current name of the driver
+            strCurDevName = strDriverNames[iDriverIdx];
+        }
     }
 
     return strStat;

src/client.cpp

@@ -639,6 +639,9 @@ void CClient::OnSndCrdReinitRequest ( int iSndCrdResetType )
         // restart client
         Sound.Start();
     }
+
+    // inform GUI about the sound card device change
+    emit SoundDeviceChanged();
 }
 
 void CClient::OnHandledSignal ( int sigNum )

src/client.h

@@ -420,5 +420,6 @@ protected slots:
                                       CVector<uint16_t> vecLevelList );
 
     void Disconnected();
+    void SoundDeviceChanged();
     void ControllerInFaderLevel ( int iChannelIdx, int iValue );
 };

src/clientdlg.cpp

@@ -488,6 +488,9 @@ CClientDlg::CClientDlg ( CClient*         pNCliP,
     QObject::connect ( pClient, &CClient::CLVersionAndOSReceived,
         this, &CClientDlg::OnCLVersionAndOSReceived );
 
+    QObject::connect ( pClient, &CClient::SoundDeviceChanged,
+        &ClientSettingsDlg, &CClientSettingsDlg::OnUpdateSoundDeviceChannelSelectionFrame );
+
     QObject::connect ( &ClientSettingsDlg, &CClientSettingsDlg::GUIDesignChanged,
         this, &CClientDlg::OnGUIDesignChanged );
 

src/clientsettingsdlg.cpp

@@ -301,16 +301,8 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient*         pNCliP,
     sldNetBufServer->setRange ( MIN_NET_BUF_SIZE_NUM_BL, MAX_NET_BUF_SIZE_NUM_BL );
     UpdateJitterBufferFrame();
 
-    // init combo box containing all available sound cards in the system
-    cbxSoundcard->clear();
-    for ( int iSndDevIdx = 0; iSndDevIdx < pClient->GetSndCrdNumDev(); iSndDevIdx++ )
-    {
-        cbxSoundcard->addItem ( pClient->GetSndCrdDeviceName ( iSndDevIdx ) );
-    }
-    cbxSoundcard->setCurrentText ( pClient->GetSndCrdDev() );
-
     // init sound card channel selection frame
-    UpdateSoundChannelSelectionFrame();
+    OnUpdateSoundDeviceChannelSelectionFrame();
 
     // Audio Channels combo box
     cbxAudioChannels->clear();
@@ -519,8 +511,17 @@ void CClientSettingsDlg::UpdateSoundCardFrame()
     }
 }
 
-void CClientSettingsDlg::UpdateSoundChannelSelectionFrame()
+void CClientSettingsDlg::OnUpdateSoundDeviceChannelSelectionFrame()
 {
+    // update combo box containing all available sound cards in the system
+    cbxSoundcard->clear();
+    for ( int iSndDevIdx = 0; iSndDevIdx < pClient->GetSndCrdNumDev(); iSndDevIdx++ )
+    {
+        cbxSoundcard->addItem ( pClient->GetSndCrdDeviceName ( iSndDevIdx ) );
+    }
+    cbxSoundcard->setCurrentText ( pClient->GetSndCrdDev() );
+
+    // update input/output channel selection
 #if defined ( _WIN32 ) || defined ( __APPLE__ ) || defined ( __MACOSX )
     int iSndChanIdx;
 
@@ -601,36 +602,33 @@ void CClientSettingsDlg::OnSoundcardActivated ( int iSndDevIdx )
             "because of the following error: " ) ) + strError +
             QString ( tr ( " The previous driver will be selected." ) ),
             tr ( "Ok" ), nullptr );
-
-        // recover old selection
-        cbxSoundcard->setCurrentText ( pClient->GetSndCrdDev() );
     }
-    UpdateSoundChannelSelectionFrame();
+    OnUpdateSoundDeviceChannelSelectionFrame();
     UpdateDisplay();
 }
 
 void CClientSettingsDlg::OnLInChanActivated ( int iChanIdx )
 {
     pClient->SetSndCrdLeftInputChannel ( iChanIdx );
-    UpdateSoundChannelSelectionFrame();
+    OnUpdateSoundDeviceChannelSelectionFrame();
 }
 
 void CClientSettingsDlg::OnRInChanActivated ( int iChanIdx )
 {
     pClient->SetSndCrdRightInputChannel ( iChanIdx );
-    UpdateSoundChannelSelectionFrame();
+    OnUpdateSoundDeviceChannelSelectionFrame();
 }
 
 void CClientSettingsDlg::OnLOutChanActivated ( int iChanIdx )
 {
     pClient->SetSndCrdLeftOutputChannel ( iChanIdx );
-    UpdateSoundChannelSelectionFrame();
+    OnUpdateSoundDeviceChannelSelectionFrame();
 }
 
 void CClientSettingsDlg::OnROutChanActivated ( int iChanIdx )
 {
     pClient->SetSndCrdRightOutputChannel ( iChanIdx );
-    UpdateSoundChannelSelectionFrame();
+    OnUpdateSoundDeviceChannelSelectionFrame();
 }
 
 void CClientSettingsDlg::OnAudioChannelsActivated ( int iChanIdx )

src/clientsettingsdlg.h

@@ -76,7 +76,6 @@ class CClientSettingsDlg : public QDialog, private Ui_CClientSettingsDlgBase
 protected:
     void    UpdateJitterBufferFrame();
     void    UpdateSoundCardFrame();
-    void    UpdateSoundChannelSelectionFrame();
     void    UpdateCustomCentralServerComboBox();
     QString GenSndCrdBufferDelayString ( const int     iFrameSize,
                                          const QString strAddText = "" );
@@ -88,7 +87,7 @@ class CClientSettingsDlg : public QDialog, private Ui_CClientSettingsDlgBase
     QTimer           TimerStatus;
     QButtonGroup     SndCrdBufferDelayButtonGroup;
 
- public slots:
+public slots:
     void OnTimerStatus() { UpdateDisplay(); }
     void OnNetBufValueChanged ( int value );
     void OnNetBufServerValueChanged ( int value );
@@ -107,6 +106,7 @@ class CClientSettingsDlg : public QDialog, private Ui_CClientSettingsDlgBase
     void OnGUIDesignActivated ( int iDesignIdx );
     void OnDriverSetupClicked();
     void OnLanguageChanged ( QString strLanguage ) { pSettings->strLanguage = strLanguage; }
+    void OnUpdateSoundDeviceChannelSelectionFrame();
 
 signals:
     void GUIDesignChanged();

windows/sound.cpp

@@ -69,12 +69,16 @@ QString CSound::LoadAndInitializeDriver ( QString strDriverName,
     // check if device is capable
     if ( strStat.isEmpty() )
     {
-        // the device has changed, per definition we reset the channel
-        // mapping to the defaults (first two available channels)
-        ResetChannelMapping();
+        // only reset the channel mapping if a new device was selected
+        if ( strCurDevName.compare ( strDriverNames[iDriverIdx] ) != 0 )
+        {
+            // the device has changed, per definition we reset the channel
+            // mapping to the defaults (first two available channels)
+            ResetChannelMapping();
 
-        // store ID of selected driver if initialization was successful
-        strCurDevName = cDriverNames[iDriverIdx];
+            // store ID of selected driver if initialization was successful
+            strCurDevName = cDriverNames[iDriverIdx];
+        }
     }
     else
     {