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

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

Revision: 887
          http://modplug.svn.sourceforge.net/modplug/?rev=887&view=rev
Author:   saga-games
Date:     2011-05-30 21:31:03 +0000 (Mon, 30 May 2011)

Log Message:
-----------
[Fix] VST Editor: Loading a VST preset (fxp) didn't mark the document as modified
[Fix] Instrument Tab: The plugin selection dialog is not shown anymore when switching to an instrument that has an unused VST slot assigned.
[Mod] Updated history.txt

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
    trunk/OpenMPT/mptrack/Ctrl_ins.cpp
    trunk/OpenMPT/packageTemplate/History.txt

Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp	2011-05-28 15:14:04 UTC (rev 886)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp	2011-05-30 21:31:03 UTC (rev 887)
@@ -121,8 +121,14 @@
 	CMainFrame::SetWorkingDirectory(files.workingDirectory.c_str(), DIR_PLUGINPRESETS, true);
 
 	//TODO: exception handling to distinguish errors at this level.
-	if (!(m_pVstPlugin->LoadProgram(files.first_file.c_str())))
+	if (m_pVstPlugin->LoadProgram(files.first_file.c_str()))
+	{
+		if(m_pVstPlugin->GetModDoc() != nullptr)
+			m_pVstPlugin->GetModDoc()->SetModified();
+	} else
+	{
 		::AfxMessageBox("Error loading preset. Are you sure it is for this plugin?");
+	}
 }
 
 VOID CAbstractVstEditor::OnSavePreset()

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2011-05-28 15:14:04 UTC (rev 886)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2011-05-30 21:31:03 UTC (rev 887)
@@ -2061,7 +2061,7 @@
 //---------------------------------------
 {
 	MODINSTRUMENT *pIns = m_pSndFile->Instruments[m_nInstrument];
-	PLUGINDEX nPlug = static_cast<PLUGINDEX>(m_CbnMixPlug.GetItemData(m_CbnMixPlug.GetCurSel()) & 0xff);	// TODO is the 0xFF necessary?
+	PLUGINDEX nPlug = static_cast<PLUGINDEX>(m_CbnMixPlug.GetItemData(m_CbnMixPlug.GetCurSel()));
 
 	if (pIns)
 	{
@@ -2090,7 +2090,7 @@
 			if (pIns->nMixPlug)	//if we have not just set to no plugin
 			{
 				PSNDMIXPLUGIN pPlug = &(m_pSndFile->m_MixPlugins[pIns->nMixPlug - 1]);
-				if (pPlug == nullptr || pPlug->pMixPlugin == nullptr)
+				if ((pPlug == nullptr || pPlug->pMixPlugin == nullptr) && !IsLocked())
 				{
 					// No plugin in this slot: Ask user to add one.
 					CSelectPluginDlg dlg(m_pModDoc, nPlug - 1, this); 

Modified: trunk/OpenMPT/packageTemplate/History.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/History.txt	2011-05-28 15:14:04 UTC (rev 886)
+++ trunk/OpenMPT/packageTemplate/History.txt	2011-05-30 21:31:03 UTC (rev 887)
@@ -10,6 +10,28 @@
 (tx XYZ): thanks to XYZ for telling us about the bug / requesting the feature
 
 
+v1.20.01.00 (*** 2011, revision 887)
+------------------------------------
+Pattern tab
+   [Fix] <Jojo> When playing a pattern that is actually not in the sequence and that has more rows than the last played order item, a crash could occour while playing those extra rows. (Welcome to episode 2938 of "this should not have happened afterall")
+   [Fix] <Jojo> Shift + Channel Dragging killed the last channel.
+   [Fix] <Jojo> When using the pattern play controls (f.e. "Replay Pattern") on a pattern that isn't played in the normal play sequence, tempo and global volume commands on the first played row are not ignored anymore.
+
+Sample tab
+   [Imp] <Jojo> When selecting parts of the sample, the selection range is now also displayed in samples, not only seconds.
+
+Instrument tab
+   [Imp] <Jojo> When in compatible mode, two envelope points cannot share the same tick anymore.
+
+VST
+   [Fix] <Jojo> When a plugin requests song position in nano secods, the correct value should now be returned.
+   [Fix] <Jojo> Loading a VST preset (fxp) didn't mark the document as modified (tx BooT-SectoR-ViruZ)
+
+Other formats
+   [Fix] <Jojo> ITP Saver: Fixed nasty bug when the internal order length was not 256.
+   [Fix] <Jojo> IMF Loader: Orpheus' 8-Bit cutoff range was not converted to MPT's 7-Bit range.
+
+
 v1.19.02.00 (May 2011, revision 871)
 ------------------------------------
 Pattern tab


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