[OMPT-svn-commit] SF.net SVN: modplug:[5374] trunk/OpenMPT/mptrack

[<sag...@us...>]

Revision: 5374
          http://sourceforge.net/p/modplug/code/5374
Author:   saga-games
Date:     2015-06-27 22:45:29 +0000 (Sat, 27 Jun 2015)
Log Message:
-----------
[Fix] Fix off-by-one error when creating instruments for plugins
[Ref] Fix type conversion warning in plugin selection dialog.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/mptrack/SelectPluginDialog.cpp
    trunk/OpenMPT/mptrack/SelectPluginDialog.h

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2015-06-27 21:41:58 UTC (rev 5373)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2015-06-27 22:45:29 UTC (rev 5374)
@@ -1922,7 +1922,7 @@
 //--------------------------------
 {
 #ifndef NO_VST
-	int nPlugslot=-1;
+	PLUGINDEX nPlugslot = PLUGINDEX_INVALID;
 	CModDoc* pModDoc = GetActiveDoc();
 
 	if (pModDoc)

Modified: trunk/OpenMPT/mptrack/SelectPluginDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/SelectPluginDialog.cpp	2015-06-27 21:41:58 UTC (rev 5373)
+++ trunk/OpenMPT/mptrack/SelectPluginDialog.cpp	2015-06-27 22:45:29 UTC (rev 5374)
@@ -55,12 +55,13 @@
 }
 
 
-CSelectPluginDlg::CSelectPluginDlg(CModDoc *pModDoc, int nPlugSlot, CWnd *parent) : CDialog(IDD_SELECTMIXPLUGIN, parent)
-//----------------------------------------------------------------------------------------------------------------------
+CSelectPluginDlg::CSelectPluginDlg(CModDoc *pModDoc, PLUGINDEX nPlugSlot, CWnd *parent)
+	: CDialog(IDD_SELECTMIXPLUGIN, parent)
+	, m_pModDoc(pModDoc)
+	, m_nPlugSlot(nPlugSlot)
+//-------------------------------------------------------------------------------------
 {
 	m_pPlugin = NULL;
-	m_pModDoc = pModDoc;
-	m_nPlugSlot = nPlugSlot;
 
 	if(m_pModDoc)
 	{
@@ -178,7 +179,7 @@
 					{
 						const CSoundFile &sndFile = m_pModDoc->GetrSoundFile();
 						INSTRUMENTINDEX instr = 0;
-						for(INSTRUMENTINDEX i = 1; i < sndFile.GetNumInstruments(); i++)
+						for(INSTRUMENTINDEX i = 1; i <= sndFile.GetNumInstruments(); i++)
 						{
 							if(sndFile.Instruments[i] != nullptr && sndFile.Instruments[i]->nMixPlug == m_nPlugSlot + 1)
 							{

Modified: trunk/OpenMPT/mptrack/SelectPluginDialog.h
===================================================================
--- trunk/OpenMPT/mptrack/SelectPluginDialog.h	2015-06-27 21:41:58 UTC (rev 5373)
+++ trunk/OpenMPT/mptrack/SelectPluginDialog.h	2015-06-27 22:45:29 UTC (rev 5374)
@@ -27,7 +27,7 @@
 //====================================
 {
 protected:
-	int m_nPlugSlot;
+	PLUGINDEX m_nPlugSlot;
 	SNDMIXPLUGIN *m_pPlugin;
 	CModDoc *m_pModDoc;
 	CTreeCtrlW m_treePlugins;
@@ -39,7 +39,7 @@
 	HTREEITEM AddTreeItem(const WCHAR *title, int image, bool sort, HTREEITEM hParent = TVI_ROOT, LPARAM lParam = NULL);
 
 public:
-	CSelectPluginDlg(CModDoc *pModDoc, int nPlugSlot, CWnd *parent);
+	CSelectPluginDlg(CModDoc *pModDoc, PLUGINDEX nPlugSlot, CWnd *parent);
 	~CSelectPluginDlg();
 
 	static VSTPluginLib *ScanPlugins(const mpt::PathString &path, CWnd *parent);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.