[OMPT-svn-commit] OpenMPT r22098 - trunk/OpenMPT/mptrack

[<sv...@op...>]

Author: sagamusix
Date: Mon Nov  4 21:11:44 2024
New Revision: 22098
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22098

Log:
[Ref] Small NOTE_MAX related cleanups.

Modified:
   trunk/OpenMPT/mptrack/Draw_pat.cpp
   trunk/OpenMPT/mptrack/dlg_misc.cpp
   trunk/OpenMPT/mptrack/dlg_misc.h

Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp	Mon Nov  4 19:54:34 2024	(r22097)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp	Mon Nov  4 21:11:44 2024	(r22098)
@@ -1686,7 +1686,7 @@
 					{
 						ModInstrument *pIns = sndFile.Instruments[m->instr];
 						s += mpt::ToCString(sndFile.GetCharsetInternal(), pIns->name);
-						if((m->note) && (m->note <= NOTE_MAX))
+						if(m->IsNote())
 						{
 							const SAMPLEINDEX nsmp = pIns->Keyboard[m->note - 1];
 							if((nsmp) && (nsmp <= sndFile.GetNumSamples()))

Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp	Mon Nov  4 19:54:34 2024	(r22097)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp	Mon Nov  4 21:11:44 2024	(r22098)
@@ -1165,12 +1165,7 @@
 	DialogBase::OnInitDialog();
 	ModInstrument *pIns = sndFile.Instruments[m_nInstrument];
 	if(pIns)
-	{
-		for(UINT i = 0; i < NOTE_MAX; i++)
-		{
-			KeyboardMap[i] = pIns->Keyboard[i];
-		}
-	}
+		KeyboardMap = pIns->Keyboard;
 	m_Keyboard.Init(this, 3, TRUE);
 	m_SbOctave.SetRange(0, 7);
 	m_SbOctave.SetPos(4);

Modified: trunk/OpenMPT/mptrack/dlg_misc.h
==============================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.h	Mon Nov  4 19:54:34 2024	(r22097)
+++ trunk/OpenMPT/mptrack/dlg_misc.h	Mon Nov  4 21:11:44 2024	(r22098)
@@ -166,8 +166,8 @@
 	bool m_mouseCapture = false, m_cursorNotify = false;
 	bool m_mouseDown = false;
 
-	uint8 KeyFlags[NOTE_MAX]; // 10 octaves max
-	SAMPLEINDEX m_sampleNum[NOTE_MAX];
+	std::array<uint8, NOTE_MAX> KeyFlags; // 10 octaves max
+	std::array<SAMPLEINDEX, NOTE_MAX> m_sampleNum;
 
 public:
 	CKeyboardControl() = default;
@@ -211,7 +211,7 @@
 
 	CSoundFile &sndFile;
 	const INSTRUMENTINDEX m_nInstrument;
-	SAMPLEINDEX KeyboardMap[NOTE_MAX];
+	std::array<SAMPLEINDEX, NOTE_MAX - NOTE_MIN + 1> KeyboardMap;
 	MouseAction mouseAction = MouseAction::Unknown;
 
 public: