[Ref] Small NOTE_MAX related cleanups.

git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@22098 56274372-70c3-4bfc-bfc3-4c3a0b034d27
OpenMPT · Nov 4, 2024 · c3167a1 · c3167a1
1 parent e27586c
commit c3167a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/mptrack/Draw_pat.cpp b/mptrack/Draw_pat.cpp
@@ -1686,7 +1686,7 @@ CString CViewPattern::GetCursorDescription() const
 					{
 						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()))

diff --git a/mptrack/dlg_misc.cpp b/mptrack/dlg_misc.cpp
@@ -1165,12 +1165,7 @@ BOOL CSampleMapDlg::OnInitDialog()
 	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);

diff --git a/mptrack/dlg_misc.h b/mptrack/dlg_misc.h
@@ -166,8 +166,8 @@ class CKeyboardControl: public CWnd
 	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 @@ class CSampleMapDlg : public DialogBase
 
 	CSoundFile &sndFile;
 	const INSTRUMENTINDEX m_nInstrument;
-	SAMPLEINDEX KeyboardMap[NOTE_MAX];
+	std::array<SAMPLEINDEX, NOTE_MAX - NOTE_MIN + 1> KeyboardMap;
 	MouseAction mouseAction = MouseAction::Unknown;
 
 public: