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

[<man...@us...>]

Revision: 3139
          http://sourceforge.net/p/modplug/code/3139
Author:   manxorist
Date:     2013-11-08 22:56:21 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
[Ref] Kill MPT_TEXT. The only real remaining usage is in MIDIMacros.cpp in tracker-only MFC code. TEXT() can be used there just fine (and in other MFC/WIN32 related places).

Modified Paths:
--------------
    trunk/OpenMPT/common/typedefs.h
    trunk/OpenMPT/soundlib/Load_xm.cpp
    trunk/OpenMPT/soundlib/MIDIMacros.cpp
    trunk/OpenMPT/soundlib/Sndfile.cpp
    trunk/OpenMPT/test/test.cpp

Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h	2013-11-08 22:53:54 UTC (rev 3138)
+++ trunk/OpenMPT/common/typedefs.h	2013-11-08 22:56:21 UTC (rev 3139)
@@ -339,8 +339,6 @@
 #endif
 #include <windows.h> // defines WIN32
 
-#define MPT_TEXT(x) TEXT(x)
-
 #else // !_WIN32
 
 // openmpt assumes these type have exact WIN32 semantics
@@ -363,8 +361,6 @@
 #define TRUE (1)
 #define FALSE (0)
 
-#define MPT_TEXT(x) x
-
 #endif // _WIN32
 
 

Modified: trunk/OpenMPT/soundlib/Load_xm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_xm.cpp	2013-11-08 22:53:54 UTC (rev 3138)
+++ trunk/OpenMPT/soundlib/Load_xm.cpp	2013-11-08 22:56:21 UTC (rev 3139)
@@ -647,8 +647,8 @@
 
 #ifndef MODPLUG_NO_FILESAVE
 
-#define str_tooMuchPatternData	(GetStrI18N((MPT_TEXT("Warning: File format limit was reached. Some pattern data may not get written to file."))))
-#define str_pattern				(GetStrI18N((MPT_TEXT("pattern"))))
+#define str_tooMuchPatternData	(GetStrI18N("Warning: File format limit was reached. Some pattern data may not get written to file."))
+#define str_pattern				(GetStrI18N("pattern"))
 
 
 bool CSoundFile::SaveXM(const char *lpszFileName, bool compatibilityExport)

Modified: trunk/OpenMPT/soundlib/MIDIMacros.cpp
===================================================================
--- trunk/OpenMPT/soundlib/MIDIMacros.cpp	2013-11-08 22:53:54 UTC (rev 3138)
+++ trunk/OpenMPT/soundlib/MIDIMacros.cpp	2013-11-08 22:56:21 UTC (rev 3139)
@@ -224,23 +224,23 @@
 				}
 				if (paramName.IsEmpty())
 				{
-					return MPT_TEXT("N/A");
+					return TEXT("N/A");
 				}
 
 				CString formattedName;
-				formattedName.Format(MPT_TEXT("Param %d (%s)"), param, paramName);
+				formattedName.Format(TEXT("Param %d (%s)"), param, paramName);
 				return formattedName;
 			} else
 #endif // NO_VST
 			{
-				return MPT_TEXT("N/A - No Plugin");
+				return TEXT("N/A - No Plugin");
 			}
 		}
 
 	case sfx_cc:
 		{
 			CString formattedCC;
-			formattedCC.Format(MPT_TEXT("MIDI CC %d"), MacroToMidiCC(macroIndex));
+			formattedCC.Format(TEXT("MIDI CC %d"), MacroToMidiCC(macroIndex));
 			return formattedCC;
 		}
 
@@ -257,26 +257,26 @@
 	switch(macroType)
 	{
 	case sfx_unused:
-		return MPT_TEXT("Unused");
+		return TEXT("Unused");
 	case sfx_cutoff:
-		return MPT_TEXT("Set Filter Cutoff");
+		return TEXT("Set Filter Cutoff");
 	case sfx_reso:
-		return MPT_TEXT("Set Filter Resonance");
+		return TEXT("Set Filter Resonance");
 	case sfx_mode:
-		return MPT_TEXT("Set Filter Mode");
+		return TEXT("Set Filter Mode");
 	case sfx_drywet:
-		return MPT_TEXT("Set Plugin Dry/Wet Ratio");
+		return TEXT("Set Plugin Dry/Wet Ratio");
 	case sfx_plug:
-		return MPT_TEXT("Control Plugin Parameter...");
+		return TEXT("Control Plugin Parameter...");
 	case sfx_cc:
-		return MPT_TEXT("MIDI CC...");
+		return TEXT("MIDI CC...");
 	case sfx_channelAT:
-		return MPT_TEXT("Channel Aftertouch");
+		return TEXT("Channel Aftertouch");
 	case sfx_polyAT:
-		return MPT_TEXT("Polyphonic Aftertouch");
+		return TEXT("Polyphonic Aftertouch");
 	case sfx_custom:
 	default:
-		return MPT_TEXT("Custom");
+		return TEXT("Custom");
 	}
 }
 
@@ -288,24 +288,24 @@
 	switch(macroType)
 	{
 	case zxx_unused:
-		return MPT_TEXT("Unused");
+		return TEXT("Unused");
 	case zxx_reso4Bit:
-		return MPT_TEXT("Z80 - Z8F controls Resonant Filter Resonance");
+		return TEXT("Z80 - Z8F controls Resonant Filter Resonance");
 	case zxx_reso7Bit:
-		return MPT_TEXT("Z80 - ZFF controls Resonant Filter Resonance");
+		return TEXT("Z80 - ZFF controls Resonant Filter Resonance");
 	case zxx_cutoff:
-		return MPT_TEXT("Z80 - ZFF controls Resonant Filter Cutoff");
+		return TEXT("Z80 - ZFF controls Resonant Filter Cutoff");
 	case zxx_mode:
-		return MPT_TEXT("Z80 - ZFF controls Resonant Filter Mode");
+		return TEXT("Z80 - ZFF controls Resonant Filter Mode");
 	case zxx_resomode:
-		return MPT_TEXT("Z80 - Z9F controls Resonance + Filter Mode");
+		return TEXT("Z80 - Z9F controls Resonance + Filter Mode");
 	case zxx_channelAT:
-		return MPT_TEXT("Z80 - ZFF controls Channel Aftertouch");
+		return TEXT("Z80 - ZFF controls Channel Aftertouch");
 	case zxx_polyAT:
-		return MPT_TEXT("Z80 - ZFF controls Polyphonic Aftertouch");
+		return TEXT("Z80 - ZFF controls Polyphonic Aftertouch");
 	case zxx_custom:
 	default:
-		return MPT_TEXT("Custom");
+		return TEXT("Custom");
 	}
 }
 

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2013-11-08 22:53:54 UTC (rev 3138)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2013-11-08 22:56:21 UTC (rev 3139)
@@ -1704,7 +1704,7 @@
 	const char* pData = nullptr;
 	HGLOBAL hglob = nullptr;
 	size_t nSize = 0;
-	if (LoadResource(MAKEINTRESOURCE(IDR_BUILTIN_TUNINGS), MPT_TEXT("TUNING"), pData, nSize, hglob) != nullptr)
+	if (LoadResource(MAKEINTRESOURCE(IDR_BUILTIN_TUNINGS), TEXT("TUNING"), pData, nSize, hglob) != nullptr)
 	{
 		std::istringstream iStrm(std::string(pData, nSize));
 		s_pTuningsSharedBuiltIn->Deserialize(iStrm);

Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp	2013-11-08 22:53:54 UTC (rev 3138)
+++ trunk/OpenMPT/test/test.cpp	2013-11-08 22:56:21 UTC (rev 3139)
@@ -50,9 +50,6 @@
 #endif
 #endif
 
-#ifndef _T
-#define _T MPT_TEXT
-#endif
 
 
 namespace MptTest

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