Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1962] trunk/OpenMPT
|
From: <man...@us...> - 2013-04-23 20:00:42
|
Revision: 1962
http://sourceforge.net/p/modplug/code/1962
Author: manxorist
Date: 2013-04-23 20:00:30 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
[Ref] Pure search and replace all of _T(x), _TEXT(x), __TEXT(x), T(x), TEXT(x) in common/ and soundlib/ with our own MPT_TEXT(x) which can safely be defined on other platform without conflicting with existing windows headers or platform or compiler specific namespaces.
Modified Paths:
--------------
trunk/OpenMPT/common/serialization_utils.cpp
trunk/OpenMPT/common/typedefs.h
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/Load_mo3.cpp
trunk/OpenMPT/soundlib/Load_xm.cpp
trunk/OpenMPT/soundlib/MIDIMacros.cpp
trunk/OpenMPT/soundlib/ModSequence.cpp
trunk/OpenMPT/soundlib/SampleFormats.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Tables.cpp
trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
trunk/OpenMPT/soundlib/tuningCollection.cpp
trunk/OpenMPT/soundlib/tuningbase.cpp
Modified: trunk/OpenMPT/common/serialization_utils.cpp
===================================================================
--- trunk/OpenMPT/common/serialization_utils.cpp 2013-04-23 19:33:33 UTC (rev 1961)
+++ trunk/OpenMPT/common/serialization_utils.cpp 2013-04-23 20:00:30 UTC (rev 1962)
@@ -200,23 +200,23 @@
int32 Ssb::s_DefaultWriteLogMask = SNT_DEFAULT_MASK;
Ssb::fpLogFunc_t Ssb::s_DefaultLogFunc = nullptr;
-const TCHAR tstrWriteHeader[] = TEXT("Write header with ID = %s\n");
-const TCHAR tstrWriteProgress[] = TEXT("Wrote entry: {num, id, rpos, size} = {%u, %s, %u, %u}\n");
-const TCHAR tstrWritingMap[] = TEXT("Writing map to rpos: %u\n");
-const TCHAR tstrMapEntryWrite[] = TEXT("Writing map entry: id=%s, rpos=%u, size=%u\n");
-const TCHAR strWriteNote[] = TEXT("Write note: ");
-const TCHAR tstrEndOfStream[] = TEXT("End of stream(rpos): %u\n");
+const TCHAR tstrWriteHeader[] = MPT_TEXT("Write header with ID = %s\n");
+const TCHAR tstrWriteProgress[] = MPT_TEXT("Wrote entry: {num, id, rpos, size} = {%u, %s, %u, %u}\n");
+const TCHAR tstrWritingMap[] = MPT_TEXT("Writing map to rpos: %u\n");
+const TCHAR tstrMapEntryWrite[] = MPT_TEXT("Writing map entry: id=%s, rpos=%u, size=%u\n");
+const TCHAR strWriteNote[] = MPT_TEXT("Write note: ");
+const TCHAR tstrEndOfStream[] = MPT_TEXT("End of stream(rpos): %u\n");
-const TCHAR tstrReadingHeader[] = TEXT("Read header with expected ID = %s\n");
-const TCHAR strNoMapInFile[] = TEXT("No map in the file.\n");
-const TCHAR strIdMismatch[] = TEXT("ID mismatch, terminating read.\n");
-const TCHAR strIdMatch[] = TEXT("ID match, continuing reading.\n");
-const TCHAR tstrReadingMap[] = TEXT("Reading map from rpos: %u\n");
-const TCHAR tstrEndOfMap[] = TEXT("End of map(rpos): %u\n");
-const TCHAR tstrReadProgress[] = TEXT("Read entry: {num, id, rpos, size, desc} = {%u, %s, %u, %s, %s}\n");
-const TCHAR tstrNoEntryFound[] = TEXT("No entry with id %s found.\n");
-const TCHAR tstrCantFindSubEntry[] = TEXT("Unable to find subentry with id=%s\n");
-const TCHAR strReadNote[] = TEXT("Read note: ");
+const TCHAR tstrReadingHeader[] = MPT_TEXT("Read header with expected ID = %s\n");
+const TCHAR strNoMapInFile[] = MPT_TEXT("No map in the file.\n");
+const TCHAR strIdMismatch[] = MPT_TEXT("ID mismatch, terminating read.\n");
+const TCHAR strIdMatch[] = MPT_TEXT("ID match, continuing reading.\n");
+const TCHAR tstrReadingMap[] = MPT_TEXT("Reading map from rpos: %u\n");
+const TCHAR tstrEndOfMap[] = MPT_TEXT("End of map(rpos): %u\n");
+const TCHAR tstrReadProgress[] = MPT_TEXT("Read entry: {num, id, rpos, size, desc} = {%u, %s, %u, %s, %s}\n");
+const TCHAR tstrNoEntryFound[] = MPT_TEXT("No entry with id %s found.\n");
+const TCHAR tstrCantFindSubEntry[] = MPT_TEXT("Unable to find subentry with id=%s\n");
+const TCHAR strReadNote[] = MPT_TEXT("Read note: ");
#define SSB_INITIALIZATION_LIST \
Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h 2013-04-23 19:33:33 UTC (rev 1961)
+++ trunk/OpenMPT/common/typedefs.h 2013-04-23 20:00:30 UTC (rev 1962)
@@ -221,7 +221,13 @@
//To mark string that should be translated in case of multilingual version.
#define GetStrI18N(x) (x)
+#if defined(WIN32) || defined(_WIN32)
+#define MPT_TEXT(x) _T(x)
+#else
+#define MPT_TEXT(x) x
+#endif
+
#ifndef NO_LOGGING
void Log(const char *format, ...);
class Logger
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2013-04-23 19:33:33 UTC (rev 1961)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2013-04-23 20:00:30 UTC (rev 1962)
@@ -22,12 +22,12 @@
#include "../common/version.h"
#include "ITTools.h"
-#define str_tooMuchPatternData (GetStrI18N((_TEXT("Warning: File format limit was reached. Some pattern data may not get written to file."))))
-#define str_pattern (GetStrI18N((_TEXT("pattern"))))
-#define str_PatternSetTruncationNote (GetStrI18N((_TEXT("The module contains %u patterns but only %u patterns can be loaded in this OpenMPT version."))))
-#define str_SequenceTruncationNote (GetStrI18N((_TEXT("Module has sequence of length %u; it will be truncated to maximum supported length, %u."))))
-#define str_LoadingIncompatibleVersion TEXT("The file informed that it is incompatible with this version of OpenMPT. Loading was terminated.")
-#define str_LoadingMoreRecentVersion TEXT("The loaded file was made with a more recent OpenMPT version and this version may not be able to load all the features or play the file correctly.")
+#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_PatternSetTruncationNote (GetStrI18N((MPT_TEXT("The module contains %u patterns but only %u patterns can be loaded in this OpenMPT version."))))
+#define str_SequenceTruncationNote (GetStrI18N((MPT_TEXT("Module has sequence of length %u; it will be truncated to maximum supported length, %u."))))
+#define str_LoadingIncompatibleVersion MPT_TEXT("The file informed that it is incompatible with this version of OpenMPT. Loading was terminated.")
+#define str_LoadingMoreRecentVersion MPT_TEXT("The loaded file was made with a more recent OpenMPT version and this version may not be able to load all the features or play the file correctly.")
const uint16 verMptFileVer = 0x891;
const uint16 verMptFileVerLoadLimit = 0x1000; // If cwtv-field is greater or equal to this value,
Modified: trunk/OpenMPT/soundlib/Load_mo3.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mo3.cpp 2013-04-23 19:33:33 UTC (rev 1961)
+++ trunk/OpenMPT/soundlib/Load_mo3.cpp 2013-04-23 20:00:30 UTC (rev 1962)
@@ -38,7 +38,7 @@
return false;
}
- AddToLog(GetStrI18N(_TEXT("The file appears to be a MO3 file, but this OpenMPT build does not support loading MO3 files.")));
+ AddToLog(GetStrI18N(MPT_TEXT("The file appears to be a MO3 file, but this OpenMPT build does not support loading MO3 files.")));
return false;
#else
@@ -49,14 +49,14 @@
#ifdef MODPLUG_TRACKER
CHAR szPath[MAX_PATH];
strcpy(szPath, theApp.GetAppDirPath());
- _tcsncat(szPath, _TEXT("unmo3.dll"), MAX_PATH - (_tcslen(szPath) + 1));
+ _tcsncat(szPath, MPT_TEXT("unmo3.dll"), MAX_PATH - (_tcslen(szPath) + 1));
HMODULE unmo3 = LoadLibrary(szPath);
#else
- HMODULE unmo3 = LoadLibrary(_TEXT("unmo3.dll"));
+ HMODULE unmo3 = LoadLibrary(MPT_TEXT("unmo3.dll"));
#endif // MODPLUG_TRACKER
if(unmo3 == nullptr) // Didn't succeed.
{
- AddToLog(GetStrI18N(_TEXT("Loading MO3 file failed because unmo3.dll could not be loaded.")));
+ AddToLog(GetStrI18N(MPT_TEXT("Loading MO3 file failed because unmo3.dll could not be loaded.")));
}
else // case: dll loaded succesfully.
{
Modified: trunk/OpenMPT/soundlib/Load_xm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_xm.cpp 2013-04-23 19:33:33 UTC (rev 1961)
+++ trunk/OpenMPT/soundlib/Load_xm.cpp 2013-04-23 20:00:30 UTC (rev 1962)
@@ -553,8 +553,8 @@
#ifndef MODPLUG_NO_FILESAVE
-#define str_tooMuchPatternData (GetStrI18N((_TEXT("Warning: File format limit was reached. Some pattern data may not get written to file."))))
-#define str_pattern (GetStrI18N((_TEXT("pattern"))))
+#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"))))
bool CSoundFile::SaveXM(LPCSTR lpszFileName, bool compatibilityExport)
Modified: trunk/OpenMPT/soundlib/MIDIMacros.cpp
===================================================================
--- trunk/OpenMPT/soundlib/MIDIMacros.cpp 2013-04-23 19:33:33 UTC (rev 1961)
+++ trunk/OpenMPT/soundlib/MIDIMacros.cpp 2013-04-23 20:00:30 UTC (rev 1962)
@@ -188,23 +188,23 @@
}
if (paramName.IsEmpty())
{
- return _T("N/A");
+ return MPT_TEXT("N/A");
}
CString formattedName;
- formattedName.Format(_T("Param %d (%s)"), param, paramName);
+ formattedName.Format(MPT_TEXT("Param %d (%s)"), param, paramName);
return formattedName;
} else
#endif // NO_VST
{
- return _T("N/A - No Plugin");
+ return MPT_TEXT("N/A - No Plugin");
}
}
case sfx_cc:
{
CString formattedCC;
- formattedCC.Format(_T("MIDI CC %d"), MacroToMidiCC(macroIndex));
+ formattedCC.Format(MPT_TEXT("MIDI CC %d"), MacroToMidiCC(macroIndex));
return formattedCC;
}
@@ -221,26 +221,26 @@
switch(macroType)
{
case sfx_unused:
- return _T("Unused");
+ return MPT_TEXT("Unused");
case sfx_cutoff:
- return _T("Set Filter Cutoff");
+ return MPT_TEXT("Set Filter Cutoff");
case sfx_reso:
- return _T("Set Filter Resonance");
+ return MPT_TEXT("Set Filter Resonance");
case sfx_mode:
- return _T("Set Filter Mode");
+ return MPT_TEXT("Set Filter Mode");
case sfx_drywet:
- return _T("Set Plugin Dry/Wet Ratio");
+ return MPT_TEXT("Set Plugin Dry/Wet Ratio");
case sfx_plug:
- return _T("Control Plugin Parameter...");
+ return MPT_TEXT("Control Plugin Parameter...");
case sfx_cc:
- return _T("MIDI CC...");
+ return MPT_TEXT("MIDI CC...");
case sfx_channelAT:
- return _T("Channel Aftertouch");
+ return MPT_TEXT("Channel Aftertouch");
case sfx_polyAT:
- return _T("Polyphonic Aftertouch");
+ return MPT_TEXT("Polyphonic Aftertouch");
case sfx_custom:
default:
- return _T("Custom");
+ return MPT_TEXT("Custom");
}
}
@@ -252,24 +252,24 @@
switch(macroType)
{
case zxx_unused:
- return _T("Unused");
+ return MPT_TEXT("Unused");
case zxx_reso4Bit:
- return _T("Z80 - Z8F controls Resonant Filter Resonance");
+ return MPT_TEXT("Z80 - Z8F controls Resonant Filter Resonance");
case zxx_reso7Bit:
- return _T("Z80 - ZFF controls Resonant Filter Resonance");
+ return MPT_TEXT("Z80 - ZFF controls Resonant Filter Resonance");
case zxx_cutoff:
- return _T("Z80 - ZFF controls Resonant Filter Cutoff");
+ return MPT_TEXT("Z80 - ZFF controls Resonant Filter Cutoff");
case zxx_mode:
- return _T("Z80 - ZFF controls Resonant Filter Mode");
+ return MPT_TEXT("Z80 - ZFF controls Resonant Filter Mode");
case zxx_resomode:
- return _T("Z80 - Z9F controls Resonance + Filter Mode");
+ return MPT_TEXT("Z80 - Z9F controls Resonance + Filter Mode");
case zxx_channelAT:
- return _T("Z80 - ZFF controls Channel Aftertouch");
+ return MPT_TEXT("Z80 - ZFF controls Channel Aftertouch");
case zxx_polyAT:
- return _T("Z80 - ZFF controls Polyphonic Aftertouch");
+ return MPT_TEXT("Z80 - ZFF controls Polyphonic Aftertouch");
case zxx_custom:
default:
- return _T("Custom");
+ return MPT_TEXT("Custom");
}
}
Modified: trunk/OpenMPT/soundlib/ModSequence.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModSequence.cpp 2013-04-23 19:33:33 UTC (rev 1961)
+++ trunk/OpenMPT/soundlib/ModSequence.cpp 2013-04-23 20:00:30 UTC (rev 1962)
@@ -20,7 +20,7 @@
#include "FileReader.h"
#include <functional>
-#define str_SequenceTruncationNote (GetStrI18N((_TEXT("Module has sequence of length %u; it will be truncated to maximum supported length, %u."))))
+#define str_SequenceTruncationNote (GetStrI18N((MPT_TEXT("Module has sequence of length %u; it will be truncated to maximum supported length, %u."))))
#if defined(MODPLUG_TRACKER)
#ifdef _DEBUG
Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp 2013-04-23 19:33:33 UTC (rev 1961)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp 2013-04-23 20:00:30 UTC (rev 1962)
@@ -2389,7 +2389,7 @@
const CString path = CString(theApp.GetAppDirPath()) + "libmpg123-0.dll";
mp3lib = LoadLibrary(path);
#else
- mp3lib = LoadLibrary(_TEXT("libmpg123-0.dll"));
+ mp3lib = LoadLibrary(MPT_TEXT("libmpg123-0.dll"));
#endif // MODPLUG_TRACKER
}
if(!mp3lib) return false;
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2013-04-23 19:33:33 UTC (rev 1961)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2013-04-23 20:00:30 UTC (rev 1962)
@@ -1208,7 +1208,7 @@
//---------------------------------------------------------------------
{
if((nInstr >= MAX_INSTRUMENTS) || (!Instruments[nInstr]))
- return TEXT("");
+ return MPT_TEXT("");
ASSERT(nInstr <= GetNumInstruments());
return Instruments[nInstr]->name;
@@ -1514,7 +1514,7 @@
const char* pData = nullptr;
HGLOBAL hglob = nullptr;
size_t nSize = 0;
- if (LoadResource(MAKEINTRESOURCE(IDR_BUILTIN_TUNINGS), TEXT("TUNING"), pData, nSize, hglob) != nullptr)
+ if (LoadResource(MAKEINTRESOURCE(IDR_BUILTIN_TUNINGS), MPT_TEXT("TUNING"), pData, nSize, hglob) != nullptr)
{
std::istrstream iStrm(pData, nSize);
s_pTuningsSharedBuiltIn->Deserialize(iStrm);
Modified: trunk/OpenMPT/soundlib/Tables.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Tables.cpp 2013-04-23 19:33:33 UTC (rev 1961)
+++ trunk/OpenMPT/soundlib/Tables.cpp 2013-04-23 20:00:30 UTC (rev 1962)
@@ -30,16 +30,16 @@
};
const LPCTSTR szDefaultNoteNames[NOTE_MAX] = {
- TEXT("C-0"), TEXT("C#0"), TEXT("D-0"), TEXT("D#0"), TEXT("E-0"), TEXT("F-0"), TEXT("F#0"), TEXT("G-0"), TEXT("G#0"), TEXT("A-0"), TEXT("A#0"), TEXT("B-0"),
- TEXT("C-1"), TEXT("C#1"), TEXT("D-1"), TEXT("D#1"), TEXT("E-1"), TEXT("F-1"), TEXT("F#1"), TEXT("G-1"), TEXT("G#1"), TEXT("A-1"), TEXT("A#1"), TEXT("B-1"),
- TEXT("C-2"), TEXT("C#2"), TEXT("D-2"), TEXT("D#2"), TEXT("E-2"), TEXT("F-2"), TEXT("F#2"), TEXT("G-2"), TEXT("G#2"), TEXT("A-2"), TEXT("A#2"), TEXT("B-2"),
- TEXT("C-3"), TEXT("C#3"), TEXT("D-3"), TEXT("D#3"), TEXT("E-3"), TEXT("F-3"), TEXT("F#3"), TEXT("G-3"), TEXT("G#3"), TEXT("A-3"), TEXT("A#3"), TEXT("B-3"),
- TEXT("C-4"), TEXT("C#4"), TEXT("D-4"), TEXT("D#4"), TEXT("E-4"), TEXT("F-4"), TEXT("F#4"), TEXT("G-4"), TEXT("G#4"), TEXT("A-4"), TEXT("A#4"), TEXT("B-4"),
- TEXT("C-5"), TEXT("C#5"), TEXT("D-5"), TEXT("D#5"), TEXT("E-5"), TEXT("F-5"), TEXT("F#5"), TEXT("G-5"), TEXT("G#5"), TEXT("A-5"), TEXT("A#5"), TEXT("B-5"),
- TEXT("C-6"), TEXT("C#6"), TEXT("D-6"), TEXT("D#6"), TEXT("E-6"), TEXT("F-6"), TEXT("F#6"), TEXT("G-6"), TEXT("G#6"), TEXT("A-6"), TEXT("A#6"), TEXT("B-6"),
- TEXT("C-7"), TEXT("C#7"), TEXT("D-7"), TEXT("D#7"), TEXT("E-7"), TEXT("F-7"), TEXT("F#7"), TEXT("G-7"), TEXT("G#7"), TEXT("A-7"), TEXT("A#7"), TEXT("B-7"),
- TEXT("C-8"), TEXT("C#8"), TEXT("D-8"), TEXT("D#8"), TEXT("E-8"), TEXT("F-8"), TEXT("F#8"), TEXT("G-8"), TEXT("G#8"), TEXT("A-8"), TEXT("A#8"), TEXT("B-8"),
- TEXT("C-9"), TEXT("C#9"), TEXT("D-9"), TEXT("D#9"), TEXT("E-9"), TEXT("F-9"), TEXT("F#9"), TEXT("G-9"), TEXT("G#9"), TEXT("A-9"), TEXT("A#9"), TEXT("B-9"),
+ MPT_TEXT("C-0"), MPT_TEXT("C#0"), MPT_TEXT("D-0"), MPT_TEXT("D#0"), MPT_TEXT("E-0"), MPT_TEXT("F-0"), MPT_TEXT("F#0"), MPT_TEXT("G-0"), MPT_TEXT("G#0"), MPT_TEXT("A-0"), MPT_TEXT("A#0"), MPT_TEXT("B-0"),
+ MPT_TEXT("C-1"), MPT_TEXT("C#1"), MPT_TEXT("D-1"), MPT_TEXT("D#1"), MPT_TEXT("E-1"), MPT_TEXT("F-1"), MPT_TEXT("F#1"), MPT_TEXT("G-1"), MPT_TEXT("G#1"), MPT_TEXT("A-1"), MPT_TEXT("A#1"), MPT_TEXT("B-1"),
+ MPT_TEXT("C-2"), MPT_TEXT("C#2"), MPT_TEXT("D-2"), MPT_TEXT("D#2"), MPT_TEXT("E-2"), MPT_TEXT("F-2"), MPT_TEXT("F#2"), MPT_TEXT("G-2"), MPT_TEXT("G#2"), MPT_TEXT("A-2"), MPT_TEXT("A#2"), MPT_TEXT("B-2"),
+ MPT_TEXT("C-3"), MPT_TEXT("C#3"), MPT_TEXT("D-3"), MPT_TEXT("D#3"), MPT_TEXT("E-3"), MPT_TEXT("F-3"), MPT_TEXT("F#3"), MPT_TEXT("G-3"), MPT_TEXT("G#3"), MPT_TEXT("A-3"), MPT_TEXT("A#3"), MPT_TEXT("B-3"),
+ MPT_TEXT("C-4"), MPT_TEXT("C#4"), MPT_TEXT("D-4"), MPT_TEXT("D#4"), MPT_TEXT("E-4"), MPT_TEXT("F-4"), MPT_TEXT("F#4"), MPT_TEXT("G-4"), MPT_TEXT("G#4"), MPT_TEXT("A-4"), MPT_TEXT("A#4"), MPT_TEXT("B-4"),
+ MPT_TEXT("C-5"), MPT_TEXT("C#5"), MPT_TEXT("D-5"), MPT_TEXT("D#5"), MPT_TEXT("E-5"), MPT_TEXT("F-5"), MPT_TEXT("F#5"), MPT_TEXT("G-5"), MPT_TEXT("G#5"), MPT_TEXT("A-5"), MPT_TEXT("A#5"), MPT_TEXT("B-5"),
+ MPT_TEXT("C-6"), MPT_TEXT("C#6"), MPT_TEXT("D-6"), MPT_TEXT("D#6"), MPT_TEXT("E-6"), MPT_TEXT("F-6"), MPT_TEXT("F#6"), MPT_TEXT("G-6"), MPT_TEXT("G#6"), MPT_TEXT("A-6"), MPT_TEXT("A#6"), MPT_TEXT("B-6"),
+ MPT_TEXT("C-7"), MPT_TEXT("C#7"), MPT_TEXT("D-7"), MPT_TEXT("D#7"), MPT_TEXT("E-7"), MPT_TEXT("F-7"), MPT_TEXT("F#7"), MPT_TEXT("G-7"), MPT_TEXT("G#7"), MPT_TEXT("A-7"), MPT_TEXT("A#7"), MPT_TEXT("B-7"),
+ MPT_TEXT("C-8"), MPT_TEXT("C#8"), MPT_TEXT("D-8"), MPT_TEXT("D#8"), MPT_TEXT("E-8"), MPT_TEXT("F-8"), MPT_TEXT("F#8"), MPT_TEXT("G-8"), MPT_TEXT("G#8"), MPT_TEXT("A-8"), MPT_TEXT("A#8"), MPT_TEXT("B-8"),
+ MPT_TEXT("C-9"), MPT_TEXT("C#9"), MPT_TEXT("D-9"), MPT_TEXT("D#9"), MPT_TEXT("E-9"), MPT_TEXT("F-9"), MPT_TEXT("F#9"), MPT_TEXT("G-9"), MPT_TEXT("G#9"), MPT_TEXT("A-9"), MPT_TEXT("A#9"), MPT_TEXT("B-9"),
};
Modified: trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
===================================================================
--- trunk/OpenMPT/soundlib/modsmp_ctrl.cpp 2013-04-23 19:33:33 UTC (rev 1961)
+++ trunk/OpenMPT/soundlib/modsmp_ctrl.cpp 2013-04-23 20:00:30 UTC (rev 1962)
@@ -73,7 +73,7 @@
memcpy(pNewSmp, smp.pSample, nOldBytes);
}
else
- sndFile.AddToLog(LogNotification, TEXT("Unsupported start position in InsertSilence."));
+ sndFile.AddToLog(LogNotification, MPT_TEXT("Unsupported start position in InsertSilence."));
}
// Set loop points automatically
Modified: trunk/OpenMPT/soundlib/tuningCollection.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuningCollection.cpp 2013-04-23 19:33:33 UTC (rev 1961)
+++ trunk/OpenMPT/soundlib/tuningCollection.cpp 2013-04-23 20:00:30 UTC (rev 1962)
@@ -28,7 +28,7 @@
using namespace std;
-const TCHAR CTuningCollection::s_FileExtension[4] = TEXT(".tc");
+const TCHAR CTuningCollection::s_FileExtension[4] = MPT_TEXT(".tc");
namespace CTuningS11n
{
Modified: trunk/OpenMPT/soundlib/tuningbase.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuningbase.cpp 2013-04-23 19:33:33 UTC (rev 1961)
+++ trunk/OpenMPT/soundlib/tuningbase.cpp 2013-04-23 20:00:30 UTC (rev 1962)
@@ -51,7 +51,7 @@
const TYPENAME CTUNINGBASE::SERIALIZATION_RETURN_TYPE CTUNINGBASE::SERIALIZATION_FAILURE = true;
TEMPLATEDEC
-const TCHAR CTUNINGBASE::s_FileExtension[5] = TEXT(".tun");
+const TCHAR CTUNINGBASE::s_FileExtension[5] = MPT_TEXT(".tun");
TEMPLATEDEC
const TYPENAME CTUNINGBASE::EDITMASK CTUNINGBASE::EM_RATIOS = 1; //1b
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
