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

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

Revision: 3907
          http://sourceforge.net/p/modplug/code/3907
Author:   saga-games
Date:     2014-03-19 02:29:56 +0000 (Wed, 19 Mar 2014)
Log Message:
-----------
[Fix] This bitness detection stuff was all backwards.
[Mod] Changed plugin manager's default size to be more sensible.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/pluginBridge/BridgeWrapper.h
    trunk/OpenMPT/soundlib/plugins/PluginManager.cpp

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2014-03-19 02:17:58 UTC (rev 3906)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2014-03-19 02:29:56 UTC (rev 3907)
@@ -147,8 +147,8 @@
 	, glGraphWindowHeight(conf, "Display", "MDIGraphHeight", 288)
 	, gnPlugWindowX(conf, "Display", "PlugSelectWindowX", 243)
 	, gnPlugWindowY(conf, "Display", "PlugSelectWindowY", 273)
-	, gnPlugWindowWidth(conf, "Display", "PlugSelectWindowWidth", 370)
-	, gnPlugWindowHeight(conf, "Display", "PlugSelectWindowHeight", 332)
+	, gnPlugWindowWidth(conf, "Display", "PlugSelectWindowWidth", 400)
+	, gnPlugWindowHeight(conf, "Display", "PlugSelectWindowHeight", 450)
 	, gnPlugWindowLast(conf, "Display", "PlugSelectWindowLast", 0)
 	, gnMsgBoxVisiblityFlags(conf, "Display", "MDIGraphHeight", uint32_max)
 	, GUIUpdateInterval(conf, "Display", "GUIUpdateInterval", 0)

Modified: trunk/OpenMPT/pluginBridge/BridgeWrapper.h
===================================================================
--- trunk/OpenMPT/pluginBridge/BridgeWrapper.h	2014-03-19 02:17:58 UTC (rev 3906)
+++ trunk/OpenMPT/pluginBridge/BridgeWrapper.h	2014-03-19 02:29:56 UTC (rev 3907)
@@ -24,13 +24,13 @@
 	enum BinaryType
 	{
 		binUnknown = 0,
-		bin32Bit = 4,
-		bin64Bit = 8,
+		bin32Bit = 32,
+		bin64Bit = 64,
 	};
 
 public:
 	static BinaryType GetPluginBinaryType(const mpt::PathString &pluginPath);
-	static bool IsPluginNative(const mpt::PathString &pluginPath) { return GetPluginBinaryType(pluginPath) == sizeof(void *); }
+	static bool IsPluginNative(const mpt::PathString &pluginPath) { return GetPluginBinaryType(pluginPath) == sizeof(void *) * 8; }
 	static uint64 GetFileVersion(const WCHAR *exePath);
 
 	static AEffect *Create(const VSTPluginLib &plugin);

Modified: trunk/OpenMPT/soundlib/plugins/PluginManager.cpp
===================================================================
--- trunk/OpenMPT/soundlib/plugins/PluginManager.cpp	2014-03-19 02:17:58 UTC (rev 3906)
+++ trunk/OpenMPT/soundlib/plugins/PluginManager.cpp	2014-03-19 02:29:56 UTC (rev 3907)
@@ -49,7 +49,7 @@
 {
 	if(dllBits == -1)
 	{
-		dllBits = BridgeWrapper::IsPluginNative(dllPath) * 8;
+		dllBits = BridgeWrapper::GetPluginBinaryType(dllPath) * 8;
 	}
 	return dllBits != 0;
 }

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