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

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

Revision: 853
          http://modplug.svn.sourceforge.net/modplug/?rev=853&view=rev
Author:   saga-games
Date:     2011-04-13 20:00:31 +0000 (Wed, 13 Apr 2011)

Log Message:
-----------
[Fix] The VST fix from rev. 844 actually broke VSTi playing.

[Mod] OpenMPT: Version is now 1.19.01.03

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
    trunk/OpenMPT/mptrack/version.h

Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp	2011-04-13 17:44:31 UTC (rev 852)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp	2011-04-13 20:00:31 UTC (rev 853)
@@ -367,25 +367,30 @@
 		m_nInstrument = GetBestInstrumentCandidate();
 
 	//only show messagebox if plug is able to process notes.
-	if(m_nInstrument < 0 && m_pVstPlugin->CanRecieveMidiEvents())
+	if(m_nInstrument < 0)
 	{
-		CModDoc *pModDoc = m_pVstPlugin->GetModDoc();
-		if(pModDoc == nullptr)
-			return false;
+		if(m_pVstPlugin->CanRecieveMidiEvents())
+		{
+			CModDoc *pModDoc = m_pVstPlugin->GetModDoc();
+			if(pModDoc == nullptr)
+				return false;
 
-		if(!m_pVstPlugin->isInstrument() || pModDoc->GetSoundFile()->GetModSpecifications().instrumentsMax == 0 ||
-			AfxMessageBox(_T("You need to assign an instrument to this plugin before you can play notes from here.\nCreate a new instrument and assign this plugin to the instrument?"), MB_YESNO | MB_ICONQUESTION) == IDNO)
+			if(!m_pVstPlugin->isInstrument() || pModDoc->GetSoundFile()->GetModSpecifications().instrumentsMax == 0 ||
+				AfxMessageBox(_T("You need to assign an instrument to this plugin before you can play notes from here.\nCreate a new instrument and assign this plugin to the instrument?"), MB_YESNO | MB_ICONQUESTION) == IDNO)
+			{
+				return false;
+			} else
+			{
+				return CreateInstrument();
+			}
+		} else
 		{
+			// Can't process notes
 			return false;
-		} else
-		{
-			return CreateInstrument();
 		}
 	} else
 	{
-		// used to return true but that doesn't make sense to me.
-		// if this is true, random (sample) channels will be retriggered when pressing notes in the editor...
-		return false;
+		return true;
 	}
 	
 }

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2011-04-13 17:44:31 UTC (rev 852)
+++ trunk/OpenMPT/mptrack/version.h	2011-04-13 20:00:31 UTC (rev 853)
@@ -15,7 +15,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					19
 #define VER_MINOR					01
-#define VER_MINORMINOR				02
+#define VER_MINORMINOR				03
 
 //Creates version number from version parts that appears in version string.
 //For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of 


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