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

[<rel...@us...>]

Revision: 261
          http://modplug.svn.sourceforge.net/modplug/?rev=261&view=rev
Author:   relabsoluness
Date:     2009-06-06 18:40:29 +0000 (Sat, 06 Jun 2009)

Log Message:
-----------
/ VST: Changed host IDs and a couple of related return values. If compatibility problems occur, old IDs can be set with ini-settings.
? Misc: Modifications to remove some compiler warnings(in mptrack.cpp).
? Misc: Changed version to 1.17.03.01.
 

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

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2009-05-30 21:38:42 UTC (rev 260)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2009-06-06 18:40:29 UTC (rev 261)
@@ -220,6 +220,7 @@
 static void ShowChangesDialog()
 //-----------------------------
 {
+	/*
 	const char* const firstOpenMessage = "OpenMPT development build " MPT_VERSION_STR ".\n\n"
 				"Some notable changes since version 1.17.02.48:\n\n"
 				"    [New] Name filter in plugin selection dialog.\n"
@@ -236,6 +237,7 @@
 				"    For more detailed list of changes, see history.txt.";
 			
 	CMainFrame::GetMainFrame()->MessageBox(firstOpenMessage, "OpenMPT v." MPT_VERSION_STR, MB_ICONINFORMATION);
+	*/
 }
 
 
@@ -1551,7 +1553,7 @@
 	if (t > 256)
 		m_bFirst = FALSE;
 
-	dir = (t/256) % 2; //change dir every 256 t
+	dir = ((t/256) % 2 != 0); //change dir every 256 t
 	t = t%256;
 	if (!dir) t = (256-t);
 	
@@ -2209,9 +2211,9 @@
 		UINT m = (m_Dib.bmiColors[i].rgbRed >> 2)
 				+ (m_Dib.bmiColors[i].rgbGreen >> 1)
 				+ (m_Dib.bmiColors[i].rgbBlue >> 2);
-		m_Dib.bmiColors[i|0x80].rgbRed = (m + r)>>1;
-		m_Dib.bmiColors[i|0x80].rgbGreen = (m + g)>>1;
-		m_Dib.bmiColors[i|0x80].rgbBlue = (m + b)>>1;
+		m_Dib.bmiColors[i|0x80].rgbRed = static_cast<BYTE>((m + r)>>1);
+		m_Dib.bmiColors[i|0x80].rgbGreen = static_cast<BYTE>((m + g)>>1);
+		m_Dib.bmiColors[i|0x80].rgbBlue = static_cast<BYTE>((m + b)>>1);
 	}
 }
 
@@ -2921,6 +2923,17 @@
 	m_pPluginManager = new CVstPluginManager;
 	if (!m_pPluginManager) return FALSE;
 	nPlugins = GetPrivateProfileInt("VST Plugins", "NumPlugins", 0, m_szConfigFileName);
+
+	#ifndef NO_VST
+		char buffer[64];
+		GetPrivateProfileString("VST Plugins", "HostProductString", CVstPluginManager::s_szHostProductString, buffer, ARRAYELEMCOUNT(buffer), m_szConfigFileName);
+		strcpy(CVstPluginManager::s_szHostProductString, buffer);
+		GetPrivateProfileString("VST Plugins", "HostVendorString", CVstPluginManager::s_szHostVendorString, buffer, ARRAYELEMCOUNT(buffer), m_szConfigFileName);
+		strcpy(CVstPluginManager::s_szHostVendorString, buffer);
+		CVstPluginManager::s_nHostVendorVersion = GetPrivateProfileInt("VST Plugins", "HostVendorVersion", CVstPluginManager::s_nHostVendorVersion, m_szConfigFileName);
+	#endif
+
+
 	CString nonFoundPlugs;
 	for (LONG iPlug=0; iPlug<nPlugins; iPlug++)
 	{
@@ -2962,6 +2975,14 @@
 	}
 	wsprintf(s, "%d", iPlug);
 	WritePrivateProfileString("VST Plugins", "NumPlugins", s, m_szConfigFileName);
+
+	#ifndef NO_VST
+		WritePrivateProfileString("VST Plugins", "HostProductString", CVstPluginManager::s_szHostProductString, m_szConfigFileName);
+		WritePrivateProfileString("VST Plugins", "HostVendorString", CVstPluginManager::s_szHostVendorString, m_szConfigFileName);
+		CMainFrame::WritePrivateProfileLong("VST Plugins", "HostVendorVersion", CVstPluginManager::s_nHostVendorVersion, m_szConfigFileName);
+	#endif
+
+
 	if (m_pPluginManager)
 	{
 		delete m_pPluginManager;

Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h	2009-05-30 21:38:42 UTC (rev 260)
+++ trunk/OpenMPT/mptrack/Mptrack.h	2009-06-06 18:40:29 UTC (rev 261)
@@ -344,7 +344,7 @@
 	MODPLUGFASTDIB m_Dib;
 	UINT m_nTextColor, m_nBkColor;
 	LPMODPLUGDIB m_pTextDib;
-	BOOL m_nBlendOffset;
+	BYTE m_nBlendOffset;
 	BYTE m_n4BitPalette[16];
 
 public:
@@ -359,7 +359,7 @@
 	void SetColor(UINT nIndex, COLORREF cr);
 	void SetAllColors(UINT nBaseIndex, UINT nColors, COLORREF *pcr);
 	void TextBlt(int x, int y, int cx, int cy, int srcx, int srcy, LPMODPLUGDIB lpdib=NULL);
-	void SetBlendMode(UINT nBlendOfs) { m_nBlendOffset = nBlendOfs; }
+	void SetBlendMode(BYTE nBlendOfs) { m_nBlendOffset = nBlendOfs; }
 	void SetBlendColor(COLORREF cr);
 };
 

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	2009-05-30 21:38:42 UTC (rev 260)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	2009-06-06 18:40:29 UTC (rev 261)
@@ -13,9 +13,14 @@
 #include "VstEditor.h"				//rewbs.defaultPlugGUI
 #include "defaultvsteditor.h"		//rewbs.defaultPlugGUI
 #include "midi.h"
+#include "version.h"
 
 #ifndef NO_VST
 
+char CVstPluginManager::s_szHostProductString[64] = "OpenMPT";
+char CVstPluginManager::s_szHostVendorString[64] = "OpenMPT project";
+long CVstPluginManager::s_nHostVendorVersion = MptVersion::num;
+
 //#define VST_LOG
 //#define ENABLE_BUZZ
 #define DMO_LOG
@@ -861,16 +866,19 @@
 	case audioMasterGetOutputSpeakerArrangement:
 		Log("VST plugin to host: Get Output Speaker Arrangement\n");
 		break;
-	case audioMasterGetVendorString:	// Prentending to be Steinberg for compat.
-		strcpy((char*)ptr,"Steinberg");
-//		strcpy((char*)ptr,"OpenMPT");
-		return 0;
-	case audioMasterGetVendorVersion:	// Prentending to be Cubase VST 7. :)
-		return 7000;					
-	case audioMasterGetProductString:	// Prentending to be Cubase VST for compat.
-		strcpy((char*)ptr,"Cubase VST");
-//		strcpy((char*)ptr,"OpenMPT");
-		return 0;
+	case audioMasterGetVendorString:	
+		strcpy((char*)ptr, s_szHostVendorString);
+		//strcpy((char*)ptr,"Steinberg");
+		//return 0;
+		return true;
+	case audioMasterGetVendorVersion:	
+		return s_nHostVendorVersion;
+		//return 7000;					
+	case audioMasterGetProductString:
+		strcpy((char*)ptr, s_szHostProductString);
+		//strcpy((char*)ptr,"Cubase VST");
+		//return 0;
+		return true;
 	case audioMasterVendorSpecific:		
 		return 0;
 	// void* in <ptr>, format not defined yet	

Modified: trunk/OpenMPT/mptrack/Vstplug.h
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.h	2009-05-30 21:38:42 UTC (rev 260)
+++ trunk/OpenMPT/mptrack/Vstplug.h	2009-06-06 18:40:29 UTC (rev 261)
@@ -249,6 +249,12 @@
 	static long VSTCALLBACK MasterCallBack(AEffect *effect, long opcode, long index, long value, void *ptr, float opt);
 	static BOOL __cdecl CreateMixPluginProc(PSNDMIXPLUGIN, CSoundFile*);
 	VstTimeInfo timeInfo;	//rewbs.VSTcompliance
+
+public:
+	static char s_szHostProductString[64];
+	static char s_szHostVendorString[64];
+	static long s_nHostVendorVersion;
+
 #else // NO_VST
 public:
 	PVSTPLUGINLIB AddPlugin(LPCSTR, BOOL =TRUE, const bool = false, CString* const = 0) {return 0;}

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2009-05-30 21:38:42 UTC (rev 260)
+++ trunk/OpenMPT/mptrack/version.h	2009-06-06 18:40:29 UTC (rev 261)
@@ -14,8 +14,8 @@
 //Version definitions. The only thing that needs to be changed when changing version number.
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					17
-#define VER_MINOR					02
-#define VER_MINORMINOR				53
+#define VER_MINOR					03
+#define VER_MINORMINOR				01
 
 //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.