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

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

Revision: 5029
          http://sourceforge.net/p/modplug/code/5029
Author:   manxorist
Date:     2015-04-30 18:17:39 +0000 (Thu, 30 Apr 2015)
Log Message:
-----------
[Ref] Partial UNICODE build support in mptrack/Mptrack.cpp.

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

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2015-04-30 18:11:20 UTC (rev 5028)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2015-04-30 18:17:39 UTC (rev 5029)
@@ -55,8 +55,8 @@
 
 CTrackApp theApp;
 
-const char *szSpecialNoteNamesMPT[] = {TEXT("PCs"), TEXT("PC"), TEXT("~~ (Note Fade)"), TEXT("^^ (Note Cut)"), TEXT("== (Note Off)")};
-const char *szSpecialNoteShortDesc[] = {TEXT("Param Control (Smooth)"), TEXT("Param Control"), TEXT("Note Fade"), TEXT("Note Cut"), TEXT("Note Off")};
+const TCHAR *szSpecialNoteNamesMPT[] = {_T("PCs"), _T("PC"), _T("~~ (Note Fade)"), _T("^^ (Note Cut)"), _T("== (Note Off)")};
+const TCHAR *szSpecialNoteShortDesc[] = {_T("Param Control (Smooth)"), _T("Param Control"), _T("Note Fade"), _T("Note Cut"), _T("Note Off")};
 
 // Make sure that special note arrays include string for every note.
 STATIC_ASSERT(NOTE_MAX_SPECIAL - NOTE_MIN_SPECIAL + 1 == CountOf(szSpecialNoteNamesMPT));
@@ -433,7 +433,7 @@
 		if(filename.empty())
 		{
 			const char *pszSection = (iMidi < 128) ? "Melodic Patches" : "Drum Patches";
-			sprintf(section, _T("%d"), iMidi & 0x7f);
+			sprintf(section, "%d", iMidi & 0x7f);
 			filename = file.Read<mpt::PathString>(pszSection, section, mpt::PathString());
 			if(forgetSettings) file.Forget(pszSection, section);
 			if(filename.empty())
@@ -490,9 +490,9 @@
 
 			char s[16];
 			if (iMidi < 128)
-				sprintf(s, _T("Midi%d"), iMidi);
+				sprintf(s, "Midi%d", iMidi);
 			else
-				sprintf(s, _T("Perc%d"), iMidi & 0x7F);
+				sprintf(s, "Perc%d", iMidi & 0x7F);
 
 			file.Write<mpt::PathString>("Midi Library", s, szFileName);
 		}
@@ -516,7 +516,7 @@
 	for(size_t i = 0; i < numBanks; i++)
 	{
 		char s[16];
-		sprintf(s, _T("Bank%d"), i + 1);
+		sprintf(s, "Bank%d", i + 1);
 		mpt::PathString path = theApp.GetSettings().Read<mpt::PathString>("DLS Banks", s, mpt::PathString());
 		path = theApp.RelativePathToAbsolute(path);
 		AddDLSBank(path);
@@ -575,7 +575,7 @@
 		}
 
 		char s[16];
-		sprintf(s, _T("Bank%d"), nBanks + 1);
+		sprintf(s, "Bank%d", nBanks + 1);
 		theApp.GetSettings().Write<mpt::PathString>("DLS Banks", s, path);
 		nBanks++;
 
@@ -1492,8 +1492,8 @@
 }
 
 
-MODPLUGDIB *LoadDib(LPCSTR lpszName)
-//----------------------------------
+MODPLUGDIB *LoadDib(LPCTSTR lpszName)
+//-----------------------------------
 {
 	HINSTANCE hInstance = AfxGetInstanceHandle();
 	HRSRC hrsrc = FindResource(hInstance, lpszName, RT_BITMAP);

Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h	2015-04-30 18:11:20 UTC (rev 5028)
+++ trunk/OpenMPT/mptrack/Mptrack.h	2015-04-30 18:17:39 UTC (rev 5029)
@@ -385,7 +385,7 @@
 ///////////////////////////////////////////////////
 // 4-bit DIB Drawing functions
 void DibBlt(HDC hdc, int x, int y, int sizex, int sizey, int srcx, int srcy, MODPLUGDIB *lpdib);
-MODPLUGDIB *LoadDib(LPCSTR lpszName);
+MODPLUGDIB *LoadDib(LPCTSTR lpszName);
 RGBQUAD rgb2quad(COLORREF c);
 
 // Other bitmap functions
@@ -414,8 +414,8 @@
 ///////////////////////////////////////////////////
 // Tables
 
-extern const char *szSpecialNoteNamesMPT[];
-extern const char *szSpecialNoteShortDesc[];
+extern const TCHAR *szSpecialNoteNamesMPT[];
+extern const TCHAR *szSpecialNoteShortDesc[];
 extern const char *szHexChar;
 
 // Defined in load_mid.cpp

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