Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[2668] trunk/OpenMPT/soundlib
|
From: <man...@us...> - 2013-09-09 10:14:57
|
Revision: 2668
http://sourceforge.net/p/modplug/code/2668
Author: manxorist
Date: 2013-09-09 10:14:49 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
[Ref] Replace last occurances of TCHAR with char in soundlib/ .
Modified Paths:
--------------
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/Load_mo3.cpp
trunk/OpenMPT/soundlib/ModSequence.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
trunk/OpenMPT/soundlib/Tables.cpp
trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2013-09-09 10:11:53 UTC (rev 2667)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2013-09-09 10:14:49 UTC (rev 2668)
@@ -26,11 +26,11 @@
#include <ext/stdio_sync_filebuf.h>
#endif
-#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_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.")
+#define str_tooMuchPatternData (GetStrI18N(("Warning: File format limit was reached. Some pattern data may not get written to file.")))
+#define str_pattern (GetStrI18N(("pattern")))
+#define str_PatternSetTruncationNote (GetStrI18N(("The module contains %u patterns but only %u patterns can be loaded in this OpenMPT version.")))
+#define str_LoadingIncompatibleVersion "The file informed that it is incompatible with this version of OpenMPT. Loading was terminated."
+#define str_LoadingMoreRecentVersion "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-09-09 10:11:53 UTC (rev 2667)
+++ trunk/OpenMPT/soundlib/Load_mo3.cpp 2013-09-09 10:14:49 UTC (rev 2668)
@@ -39,7 +39,7 @@
return false;
}
- AddToLog(GetStrI18N(MPT_TEXT("The file appears to be a MO3 file, but this OpenMPT build does not support loading MO3 files.")));
+ AddToLog(GetStrI18N("The file appears to be a MO3 file, but this OpenMPT build does not support loading MO3 files."));
return false;
#else
@@ -61,7 +61,7 @@
#endif // MODPLUG_TRACKER
if(unmo3 == nullptr) // Didn't succeed.
{
- AddToLog(GetStrI18N(MPT_TEXT("Loading MO3 file failed because unmo3.dll could not be loaded.")));
+ AddToLog(GetStrI18N("Loading MO3 file failed because unmo3.dll could not be loaded."));
}
else // case: dll loaded succesfully.
{
Modified: trunk/OpenMPT/soundlib/ModSequence.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModSequence.cpp 2013-09-09 10:11:53 UTC (rev 2667)
+++ trunk/OpenMPT/soundlib/ModSequence.cpp 2013-09-09 10:14:49 UTC (rev 2668)
@@ -20,7 +20,7 @@
#include "FileReader.h"
#include <functional>
-#define str_SequenceTruncationNote (GetStrI18N((MPT_TEXT("Module has sequence of length %u; it will be truncated to maximum supported length, %u."))))
+#define str_SequenceTruncationNote (GetStrI18N("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/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2013-09-09 10:11:53 UTC (rev 2667)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2013-09-09 10:14:49 UTC (rev 2668)
@@ -1382,8 +1382,8 @@
}
-LPCTSTR CSoundFile::GetSampleName(UINT nSample) const
-//---------------------------------------------------
+const char *CSoundFile::GetSampleName(UINT nSample) const
+//-------------------------------------------------------
{
ASSERT(nSample <= GetNumSamples());
if (nSample < MAX_SAMPLES)
@@ -1400,7 +1400,7 @@
//---------------------------------------------------------------------
{
if((nInstr >= MAX_INSTRUMENTS) || (!Instruments[nInstr]))
- return MPT_TEXT("");
+ return "";
ASSERT(nInstr <= GetNumInstruments());
return Instruments[nInstr]->name;
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2013-09-09 10:11:53 UTC (rev 2667)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2013-09-09 10:14:49 UTC (rev 2668)
@@ -480,7 +480,7 @@
void SetCurrentOrder(ORDERINDEX nOrder);
std::string GetTitle() const { return songName; }
bool SetTitle(const std::string &newTitle); // Return true if title was changed.
- LPCTSTR GetSampleName(UINT nSample) const;
+ const char *GetSampleName(UINT nSample) const;
const char *GetInstrumentName(INSTRUMENTINDEX nInstr) const;
UINT GetMusicSpeed() const { return m_nMusicSpeed; }
UINT GetMusicTempo() const { return m_nMusicTempo; }
@@ -806,7 +806,7 @@
extern const LPCSTR szNoteNames[12];
-extern const LPCTSTR szDefaultNoteNames[NOTE_MAX];
+extern const LPCSTR szDefaultNoteNames[NOTE_MAX];
inline IMixPlugin* CSoundFile::GetInstrumentPlugin(INSTRUMENTINDEX instr)
Modified: trunk/OpenMPT/soundlib/Tables.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Tables.cpp 2013-09-09 10:11:53 UTC (rev 2667)
+++ trunk/OpenMPT/soundlib/Tables.cpp 2013-09-09 10:14:49 UTC (rev 2668)
@@ -29,17 +29,17 @@
"F#", "G-", "G#", "A-", "A#", "B-"
};
-const LPCTSTR szDefaultNoteNames[NOTE_MAX] = {
- 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"),
+const LPCSTR szDefaultNoteNames[NOTE_MAX] = {
+ "C-0", "C#0", "D-0", "D#0", "E-0", "F-0", "F#0", "G-0", "G#0", "A-0", "A#0", "B-0",
+ "C-1", "C#1", "D-1", "D#1", "E-1", "F-1", "F#1", "G-1", "G#1", "A-1", "A#1", "B-1",
+ "C-2", "C#2", "D-2", "D#2", "E-2", "F-2", "F#2", "G-2", "G#2", "A-2", "A#2", "B-2",
+ "C-3", "C#3", "D-3", "D#3", "E-3", "F-3", "F#3", "G-3", "G#3", "A-3", "A#3", "B-3",
+ "C-4", "C#4", "D-4", "D#4", "E-4", "F-4", "F#4", "G-4", "G#4", "A-4", "A#4", "B-4",
+ "C-5", "C#5", "D-5", "D#5", "E-5", "F-5", "F#5", "G-5", "G#5", "A-5", "A#5", "B-5",
+ "C-6", "C#6", "D-6", "D#6", "E-6", "F-6", "F#6", "G-6", "G#6", "A-6", "A#6", "B-6",
+ "C-7", "C#7", "D-7", "D#7", "E-7", "F-7", "F#7", "G-7", "G#7", "A-7", "A#7", "B-7",
+ "C-8", "C#8", "D-8", "D#8", "E-8", "F-8", "F#8", "G-8", "G#8", "A-8", "A#8", "B-8",
+ "C-9", "C#9", "D-9", "D#9", "E-9", "F-9", "F#9", "G-9", "G#9", "A-9", "A#9", "B-9",
};
Modified: trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
===================================================================
--- trunk/OpenMPT/soundlib/modsmp_ctrl.cpp 2013-09-09 10:11:53 UTC (rev 2667)
+++ trunk/OpenMPT/soundlib/modsmp_ctrl.cpp 2013-09-09 10:14:49 UTC (rev 2668)
@@ -73,7 +73,7 @@
memcpy(pNewSmp, smp.pSample, nOldBytes);
}
else
- sndFile.AddToLog(LogNotification, MPT_TEXT("Unsupported start position in InsertSilence."));
+ sndFile.AddToLog(LogNotification, "Unsupported start position in InsertSilence.");
}
// Set loop points automatically
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
