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

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

Author: sagamusix
Date: Sun Apr 28 17:36:01 2024
New Revision: 20670
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20670

Log:
[Ref] Use PluginComboBox for CMidiMacroSetup.

Modified:
   trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp
   trunk/OpenMPT/mptrack/MIDIMacroDialog.h

Modified: trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp	Sun Apr 28 16:34:58 2024	(r20669)
+++ trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp	Sun Apr 28 17:36:01 2024	(r20670)
@@ -11,7 +11,6 @@
 #include "stdafx.h"
 #include "MIDIMacroDialog.h"
 #include "Mptrack.h"
-#include "PluginComboBox.h"
 #include "Reporting.h"
 #include "resource.h"
 #include "../common/mptStringBuffer.h"
@@ -135,22 +134,9 @@
 		m_EditMacro[m].ShowAll.SetFont(GetFont());
 	}
 	UpdateMacroList();
-
-#ifndef NO_PLUGINS
-	for(PLUGINDEX i = 0; i < MAX_MIXPLUGINS; i++)
-	{
-		const SNDMIXPLUGIN &plugin = m_SndFile.m_MixPlugins[i];
-
-		if(plugin.IsValidPlugin())
-		{
-			s.Format(_T("FX%d: "), i + 1);
-			s += mpt::ToCString(plugin.GetName());
-			m_CbnMacroPlug.SetItemData(m_CbnMacroPlug.AddString(s), i);
-		}
-	}
-	m_CbnMacroPlug.SetCurSel(0);
+	m_CbnMacroPlug.Update(PluginComboBox::Config{PluginComboBox::Flags::ShowLibraryNames}, m_SndFile);
+	m_CbnMacroPlug.SetRawSelection(0);
 	OnPlugChanged();
-#endif  // NO_PLUGINS
 	return FALSE;
 }
 
@@ -378,7 +364,7 @@
 void CMidiMacroSetup::OnPlugChanged()
 {
 #ifndef NO_PLUGINS
-	DWORD_PTR plug = m_CbnMacroPlug.GetItemData(m_CbnMacroPlug.GetCurSel());
+	PLUGINDEX plug = m_CbnMacroPlug.GetSelection().value_or(PLUGINDEX_INVALID);
 
 	if(plug >= MAX_MIXPLUGINS)
 		return;

Modified: trunk/OpenMPT/mptrack/MIDIMacroDialog.h
==============================================================================
--- trunk/OpenMPT/mptrack/MIDIMacroDialog.h	Sun Apr 28 16:34:58 2024	(r20669)
+++ trunk/OpenMPT/mptrack/MIDIMacroDialog.h	Sun Apr 28 17:36:01 2024	(r20670)
@@ -13,6 +13,7 @@
 #include "openmpt/all/BuildSettings.hpp"
 
 #include "ColourEdit.h"
+#include "PluginComboBox.h"
 #include "../common/misc_util.h"
 #include "../soundlib/MIDIMacros.h"
 #include "mpt/base/alloc.hpp"
@@ -24,7 +25,8 @@
 class CMidiMacroSetup: public CDialog
 {
 protected:
-	CComboBox m_CbnSFx, m_CbnSFxPreset, m_CbnZxx, m_CbnZxxPreset, m_CbnMacroPlug, m_CbnMacroParam, m_CbnMacroCC;
+	CComboBox m_CbnSFx, m_CbnSFxPreset, m_CbnZxx, m_CbnZxxPreset, m_CbnMacroParam, m_CbnMacroCC;
+	PluginComboBox m_CbnMacroPlug;
 	CEdit m_EditSFx, m_EditZxx;
 	struct MacroEdit
 	{