Use INVALID_MIDI_CH for Mixer UI switch

jamulussoftware · Oct 26, 2024 · cd31d25 · cd31d25
1 parent 8b26969
commit cd31d25
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/src/client.h b/src/client.h
@@ -272,6 +272,8 @@ class CClient : public QObject
         Channel.GetBufErrorRates ( vecErrRates, dLimit, dMaxUpLimit );
     }
 
+    bool IsMIDIEnabled() { return Sound.IsMIDIEnabled(); }
+
     // settings
     CChannelCoreInfo ChannelInfo;
     QString          strClientName;

diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp
@@ -28,7 +28,6 @@
 CClientDlg::CClientDlg ( CClient*         pNCliP,
                          CClientSettings* pNSetP,
                          const QString&   strConnOnStartupAddress,
-                         const QString&   strMIDISetup,
                          const bool       bNewShowComplRegConnList,
                          const bool       bShowAnalyzerConsole,
                          const bool       bMuteStream,
@@ -219,7 +218,7 @@ CClientDlg::CClientDlg ( CClient*         pNCliP,
     MainMixerBoard->SetNumMixerPanelRows ( pSettings->iNumMixerPanelRows );
 
     // Pass through flag for MIDICtrlUsed
-    MainMixerBoard->SetMIDICtrlUsed ( !strMIDISetup.isEmpty() );
+    MainMixerBoard->SetMIDICtrlUsed ( pClient->IsMIDIEnabled() );
 
     // reset mixer board
     MainMixerBoard->HideAll();

diff --git a/src/clientdlg.h b/src/clientdlg.h
@@ -77,7 +77,6 @@ class CClientDlg : public CBaseDlg, private Ui_CClientDlgBase
     CClientDlg ( CClient*         pNCliP,
                  CClientSettings* pNSetP,
                  const QString&   strConnOnStartupAddress,
-                 const QString&   strMIDISetup,
                  const bool       bNewShowComplRegConnList,
                  const bool       bShowAnalyzerConsole,
                  const bool       bMuteStream,

diff --git a/src/main.cpp b/src/main.cpp
@@ -953,7 +953,6 @@ int main ( int argc, char** argv )
                 CClientDlg ClientDlg ( &Client,
                                        &Settings,
                                        strConnOnStartupAddress,
-                                       strMIDISetup,
                                        bShowComplRegConnList,
                                        bShowAnalyzerConsole,
                                        bMuteStream,

diff --git a/src/sound/soundbase.h b/src/sound/soundbase.h
@@ -115,6 +115,8 @@ class CSoundBase : public QThread
     // in a callback function it has to be public -> better solution
     void EmitReinitRequestSignal ( const ESndCrdResetType eSndCrdResetType ) { emit ReinitRequest ( eSndCrdResetType ); }
 
+    bool IsMIDIEnabled() { return iCtrlMIDIChannel != INVALID_MIDI_CH; }
+
 protected:
     virtual QString  LoadAndInitializeDriver ( QString, bool ) { return ""; }
     virtual void     UnloadCurrentDriver() {}