show channel numbers if --ctrlmidich is used (#241, #95)

jamulussoftware · Jun 6, 2020 · 3307365 · 3307365
1 parent ab92abf
commit 3307365
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -16,14 +16,15 @@
 
 - avoid showing IP address if no name in the musician profile is given (#316)
 
+- show channel numbers if --ctrlmidich is used (#241, #95)
+
 - bug fix: on MacOS declare an activity to ensure the process doesn't get throttled
   by OS level Nap, Sleep, and Thread Priority systems, coded by AronVietti (#23)
 
 
 
 
 
-
 3.5.5 (2020-05-26)
 
 - added banjo/mandolin instrument icons created by atsampson (#283)

diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp
@@ -29,6 +29,7 @@
 CClientDlg::CClientDlg ( CClient*        pNCliP,
                          CSettings*      pNSetP,
                          const QString&  strConnOnStartupAddress,
+                         const int       iCtrlMIDIChannel,
                          const bool      bNewShowComplRegConnList,
                          const bool      bShowAnalyzerConsole,
                          QWidget*        parent,
@@ -37,6 +38,7 @@ CClientDlg::CClientDlg ( CClient*        pNCliP,
     pClient             ( pNCliP ),
     pSettings           ( pNSetP ),
     bConnectDlgWasShown ( false ),
+    bMIDICtrlUsed       ( iCtrlMIDIChannel != INVALID_MIDI_CH ),
     ClientSettingsDlg   ( pNCliP, parent, Qt::Window ),
     ChatDlg             ( parent, Qt::Window ),
     ConnectDlg          ( pNCliP, bNewShowComplRegConnList, parent, Qt::Dialog ),
@@ -812,6 +814,15 @@ void CClientDlg::OnLicenceRequired ( ELicenceType eLicenceType )
 
 void CClientDlg::OnConClientListMesReceived ( CVector<CChannelInfo> vecChanInfo )
 {
+    // show channel numbers if --ctrlmidich is used (#241, #95)
+    if ( bMIDICtrlUsed )
+    {
+        for ( int i = 0; i < vecChanInfo.Size(); i++ )
+        {
+            vecChanInfo[i].strName.prepend ( QString().setNum ( vecChanInfo[i].iChanID ) + ":" );
+        }
+    }
+
     // update mixer board with the additional client infos
     MainMixerBoard->ApplyNewConClientList ( vecChanInfo );
 }

diff --git a/src/clientdlg.h b/src/clientdlg.h
@@ -72,6 +72,7 @@ class CClientDlg : public QDialog, private Ui_CClientDlgBase
     CClientDlg ( CClient*        pNCliP,
                  CSettings*      pNSetP,
                  const QString&  strConnOnStartupAddress,
+                 const int       iCtrlMIDIChannel,
                  const bool      bNewShowComplRegConnList,
                  const bool      bShowAnalyzerConsole,
                  QWidget*        parent = nullptr,
@@ -96,6 +97,7 @@ class CClientDlg : public QDialog, private Ui_CClientDlgBase
 
     bool               bConnected;
     bool               bConnectDlgWasShown;
+    bool               bMIDICtrlUsed;
     QTimer             TimerSigMet;
     QTimer             TimerBuffersLED;
     QTimer             TimerStatus;

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