Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[2169] trunk/OpenMPT
|
From: <man...@us...> - 2013-05-21 23:42:47
|
Revision: 2169
http://sourceforge.net/p/modplug/code/2169
Author: manxorist
Date: 2013-05-21 23:42:33 +0000 (Tue, 21 May 2013)
Log Message:
-----------
[Ref] Move stuff from namespace StringFixer into namespace mpt::String. (Just rename things, this changeset does nothing else)
Modified Paths:
--------------
trunk/OpenMPT/common/StringFixer.h
trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
trunk/OpenMPT/mptrack/CleanupSong.cpp
trunk/OpenMPT/mptrack/Ctrl_ins.cpp
trunk/OpenMPT/mptrack/Ctrl_pat.cpp
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/Draw_pat.cpp
trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/Modedit.cpp
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/SelectPluginDialog.cpp
trunk/OpenMPT/mptrack/TrackerSettings.cpp
trunk/OpenMPT/mptrack/Undo.cpp
trunk/OpenMPT/mptrack/View_gen.cpp
trunk/OpenMPT/mptrack/View_tre.cpp
trunk/OpenMPT/mptrack/VstPresets.cpp
trunk/OpenMPT/mptrack/Vstplug.cpp
trunk/OpenMPT/mptrack/Vstplug.h
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/mptrack/mod2midi.cpp
trunk/OpenMPT/mptrack/test/test.cpp
trunk/OpenMPT/mptrack/view_com.cpp
trunk/OpenMPT/soundlib/Dlsbank.cpp
trunk/OpenMPT/soundlib/FileReader.h
trunk/OpenMPT/soundlib/ITTools.cpp
trunk/OpenMPT/soundlib/LOAD_AMF.CPP
trunk/OpenMPT/soundlib/LOAD_DBM.CPP
trunk/OpenMPT/soundlib/LOAD_DMF.CPP
trunk/OpenMPT/soundlib/LOAD_DSM.CPP
trunk/OpenMPT/soundlib/Load_669.cpp
trunk/OpenMPT/soundlib/Load_ams.cpp
trunk/OpenMPT/soundlib/Load_digi.cpp
trunk/OpenMPT/soundlib/Load_far.cpp
trunk/OpenMPT/soundlib/Load_gdm.cpp
trunk/OpenMPT/soundlib/Load_imf.cpp
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/Load_itp.cpp
trunk/OpenMPT/soundlib/Load_mdl.cpp
trunk/OpenMPT/soundlib/Load_med.cpp
trunk/OpenMPT/soundlib/Load_mod.cpp
trunk/OpenMPT/soundlib/Load_mt2.cpp
trunk/OpenMPT/soundlib/Load_mtm.cpp
trunk/OpenMPT/soundlib/Load_okt.cpp
trunk/OpenMPT/soundlib/Load_psm.cpp
trunk/OpenMPT/soundlib/Load_ptm.cpp
trunk/OpenMPT/soundlib/Load_s3m.cpp
trunk/OpenMPT/soundlib/Load_stm.cpp
trunk/OpenMPT/soundlib/Load_ult.cpp
trunk/OpenMPT/soundlib/Load_umx.cpp
trunk/OpenMPT/soundlib/Load_xm.cpp
trunk/OpenMPT/soundlib/MIDIMacros.cpp
trunk/OpenMPT/soundlib/SampleFormats.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/WAVTools.cpp
trunk/OpenMPT/soundlib/XMTools.cpp
trunk/OpenMPT/soundlib/load_j2b.cpp
Modified: trunk/OpenMPT/common/StringFixer.h
===================================================================
--- trunk/OpenMPT/common/StringFixer.h 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/common/StringFixer.h 2013-05-21 23:42:33 UTC (rev 2169)
@@ -13,7 +13,7 @@
#include <string.h>
-namespace StringFixer
+namespace mpt { namespace String
{
// Sets last character to null in given char array.
@@ -69,7 +69,7 @@
// Used for reading strings from files.
// Only use this version of the function if the size of the source buffer is variable.
template <ReadWriteMode mode, size_t destSize>
- void ReadString(char (&destBuffer)[destSize], const char *srcBuffer, const size_t srcSize)
+ void Read(char (&destBuffer)[destSize], const char *srcBuffer, const size_t srcSize)
//----------------------------------------------------------------------------------------
{
STATIC_ASSERT(destSize > 0);
@@ -152,12 +152,12 @@
// Used for reading strings from files.
// Preferrably use this version of the function, it is safer.
template <ReadWriteMode mode, size_t destSize, size_t srcSize>
- void ReadString(char (&destBuffer)[destSize], const char (&srcBuffer)[srcSize])
+ void Read(char (&destBuffer)[destSize], const char (&srcBuffer)[srcSize])
//-----------------------------------------------------------------------------
{
STATIC_ASSERT(destSize > 0);
STATIC_ASSERT(srcSize > 0);
- ReadString<mode, destSize>(destBuffer, srcBuffer, srcSize);
+ Read<mode, destSize>(destBuffer, srcBuffer, srcSize);
}
@@ -165,7 +165,7 @@
// Used for writing strings to files.
// Only use this version of the function if the size of the source buffer is variable.
template <ReadWriteMode mode, size_t destSize>
- void WriteString(char (&destBuffer)[destSize], const char *srcBuffer, const size_t srcSize)
+ void Write(char (&destBuffer)[destSize], const char *srcBuffer, const size_t srcSize)
//-----------------------------------------------------------------------------------------
{
STATIC_ASSERT(destSize > 0);
@@ -209,12 +209,12 @@
// Used for writing strings to files.
// Preferrably use this version of the function, it is safer.
template <ReadWriteMode mode, size_t destSize, size_t srcSize>
- void WriteString(char (&destBuffer)[destSize], const char (&srcBuffer)[srcSize])
+ void Write(char (&destBuffer)[destSize], const char (&srcBuffer)[srcSize])
//------------------------------------------------------------------------------
{
STATIC_ASSERT(destSize > 0);
STATIC_ASSERT(srcSize > 0);
- WriteString<mode, destSize>(destBuffer, srcBuffer, srcSize);
+ Write<mode, destSize>(destBuffer, srcBuffer, srcSize);
}
@@ -236,5 +236,6 @@
CopyN(destBuffer, srcBuffer, srcSize);
}
-};
+} } // namespace mpt::String
+
Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -864,7 +864,7 @@
m_nInstrument = nIns;
_snprintf(pIns->name, CountOf(pIns->name) - 1, _T("%d: %s"), m_VstPlugin.GetSlot() + 1, sndFile.m_MixPlugins[m_VstPlugin.GetSlot()].GetName());
- StringFixer::CopyN(pIns->filename, sndFile.m_MixPlugins[m_VstPlugin.GetSlot()].GetLibraryName());
+ mpt::String::CopyN(pIns->filename, sndFile.m_MixPlugins[m_VstPlugin.GetSlot()].GetLibraryName());
pIns->nMixPlug = (PLUGINDEX)m_VstPlugin.GetSlot() + 1;
pIns->nMidiChannel = 1;
// People will forget to change this anyway, so the following lines can lead to some bad surprises after re-opening the module.
Modified: trunk/OpenMPT/mptrack/CleanupSong.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CleanupSong.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/CleanupSong.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -328,7 +328,7 @@
{
//strncpy_s(pTTTA->szText, sizeof(pTTTA->szText), strTipText,
// strTipText.GetLength() + 1);
- StringFixer::CopyN(pTTTA->szText, strTipText);
+ mpt::String::CopyN(pTTTA->szText, strTipText);
}
else
{
Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -1446,12 +1446,12 @@
if (!pIns->name[0] && m_sndFile.GetModSpecifications().instrNameLengthMax > 0)
{
- StringFixer::CopyN(pIns->name, szName, m_sndFile.GetModSpecifications().instrNameLengthMax);
+ mpt::String::CopyN(pIns->name, szName, m_sndFile.GetModSpecifications().instrNameLengthMax);
}
if (!pIns->filename[0] && m_sndFile.GetModSpecifications().instrFilenameLengthMax > 0)
{
strcat(szName, szExt);
- StringFixer::CopyN(pIns->filename, szName, m_sndFile.GetModSpecifications().instrFilenameLengthMax);
+ mpt::String::CopyN(pIns->filename, szName, m_sndFile.GetModSpecifications().instrFilenameLengthMax);
}
SetCurrentInstrument(m_nInstrument);
@@ -1730,10 +1730,10 @@
if (!pIns) return;
if (pIns->filename[0])
{
- StringFixer::Copy(szFileName, pIns->filename);
+ mpt::String::Copy(szFileName, pIns->filename);
} else
{
- StringFixer::Copy(szFileName, pIns->name);
+ mpt::String::Copy(szFileName, pIns->name);
}
SanitizeFilename(szFileName);
@@ -1807,7 +1807,7 @@
ModInstrument *pIns = m_sndFile.Instruments[m_nInstrument];
if ((pIns) && (strncmp(s, pIns->name, MAX_INSTRUMENTNAME)))
{
- StringFixer::Copy(pIns->name, s);
+ mpt::String::Copy(pIns->name, s);
SetInstrumentModified(true);
}
}
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -1076,7 +1076,7 @@
CHAR s[MAX_PATTERNNAME];
m_EditPatName.GetWindowText(s, CountOf(s));
- StringFixer::SetNullTerminator(s);
+ mpt::String::SetNullTerminator(s);
if(m_sndFile.Patterns[nPat].GetName() != s)
{
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -658,10 +658,10 @@
wsprintf(s, "%d-bit %s, len: %d", sample.GetElementarySampleSize() * 8, (sample.uFlags & CHN_STEREO) ? "stereo" : "mono", sample.nLength);
SetDlgItemText(IDC_TEXT5, s);
// Name
- StringFixer::Copy(s, m_sndFile.m_szNames[m_nSample]);
+ mpt::String::Copy(s, m_sndFile.m_szNames[m_nSample]);
SetDlgItemText(IDC_SAMPLE_NAME, s);
// File Name
- StringFixer::Copy(s, sample.filename);
+ mpt::String::Copy(s, sample.filename);
if (m_sndFile.GetType() & (MOD_TYPE_MOD | MOD_TYPE_XM)) s[0] = 0;
SetDlgItemText(IDC_SAMPLE_FILENAME, s);
// Volume
@@ -836,10 +836,10 @@
{
// S3M/IT
szFullFilename[31] = 0;
- if (!m_sndFile.m_szNames[m_nSample][0]) StringFixer::Copy(m_sndFile.m_szNames[m_nSample], szFullFilename);
+ if (!m_sndFile.m_szNames[m_nSample][0]) mpt::String::Copy(m_sndFile.m_szNames[m_nSample], szFullFilename);
if (strlen(szFullFilename) < 9) strcat(szFullFilename, szExt);
}
- StringFixer::Copy(sample.filename, szFullFilename);
+ mpt::String::Copy(sample.filename, szFullFilename);
}
if ((m_sndFile.GetType() & MOD_TYPE_XM) && (!(sample.uFlags & CHN_PANNING)))
{
@@ -1011,11 +1011,11 @@
}
if(m_sndFile.GetType() & (MOD_TYPE_S3M|MOD_TYPE_IT|MOD_TYPE_MPT))
{
- StringFixer::Copy(szFileName, m_sndFile.GetSample(m_nSample).filename);
+ mpt::String::Copy(szFileName, m_sndFile.GetSample(m_nSample).filename);
}
if(!szFileName[0])
{
- StringFixer::Copy(szFileName, m_sndFile.m_szNames[m_nSample]);
+ mpt::String::Copy(szFileName, m_sndFile.m_szNames[m_nSample]);
}
if(!szFileName[0]) strcpy(szFileName, "untitled");
if(strlen(szFileName) >= 5 && !_strcmpi(szFileName + strlen(szFileName) - 5, ".flac"))
@@ -1036,7 +1036,7 @@
sPath += ".wav";
_splitpath(sPath, NULL, NULL, szFileName, NULL);
}
- StringFixer::SetNullTerminator(szFileName);
+ mpt::String::SetNullTerminator(szFileName);
SanitizeFilename(szFileName);
CString format = CMainFrame::GetPrivateProfileCString("Sample Editor", "DefaultFormat", defaultFLAC ? "flac" : "wav", theApp.GetConfigFileName());
@@ -2331,7 +2331,7 @@
s[31] = 0;
if (strncmp(s, m_sndFile.m_szNames[m_nSample], MAX_SAMPLENAME))
{
- StringFixer::Copy(m_sndFile.m_szNames[m_nSample], s);
+ mpt::String::Copy(m_sndFile.m_szNames[m_nSample], s);
m_modDoc.UpdateAllViews(NULL, (m_nSample << HINT_SHIFT_SMP) | (HINT_SMPNAMES|HINT_SAMPLEINFO), this);
m_modDoc.UpdateAllViews(NULL, HINT_INSNAMES, this);
m_modDoc.SetModified();
@@ -2347,11 +2347,11 @@
if(IsLocked()) return;
s[0] = 0;
m_EditFileName.GetWindowText(s, sizeof(s));
- StringFixer::SetNullTerminator(s);
+ mpt::String::SetNullTerminator(s);
if (strncmp(s, m_sndFile.GetSample(m_nSample).filename, MAX_SAMPLEFILENAME))
{
- StringFixer::Copy(m_sndFile.GetSample(m_nSample).filename, s);
+ mpt::String::Copy(m_sndFile.GetSample(m_nSample).filename, s);
m_modDoc.UpdateAllViews(NULL, (m_nSample << HINT_SHIFT_SMP) | HINT_SAMPLEINFO, this);
if (m_sndFile.m_nType & (MOD_TYPE_S3M|MOD_TYPE_IT|MOD_TYPE_MPT)) m_modDoc.SetModified();
}
Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -1599,7 +1599,7 @@
// display plugin name.
if(m->instr <= MAX_MIXPLUGINS)
{
- StringFixer::CopyN(sztmp, pSndFile->m_MixPlugins[m->instr - 1].GetName());
+ mpt::String::CopyN(sztmp, pSndFile->m_MixPlugins[m->instr - 1].GetName());
}
} else
{
@@ -1609,7 +1609,7 @@
if ((m->instr <= pSndFile->GetNumInstruments()) && (pSndFile->Instruments[m->instr]))
{
ModInstrument *pIns = pSndFile->Instruments[m->instr];
- StringFixer::Copy(sztmp, pIns->name);
+ mpt::String::Copy(sztmp, pIns->name);
if ((m->note) && (m->note <= NOTE_MAX))
{
const SAMPLEINDEX nsmp = pIns->Keyboard[m->note - 1];
@@ -1626,12 +1626,12 @@
{
if (m->instr <= pSndFile->GetNumSamples())
{
- StringFixer::Copy(sztmp, pSndFile->m_szNames[m->instr]);
+ mpt::String::Copy(sztmp, pSndFile->m_szNames[m->instr]);
}
}
}
- StringFixer::SetNullTerminator(sztmp);
+ mpt::String::SetNullTerminator(sztmp);
if (sztmp[0]) wsprintf(s, "%d: %s", m->instr, sztmp);
}
break;
@@ -1644,7 +1644,7 @@
if(m->instr > 0 && m->instr <= MAX_MIXPLUGINS)
{
CHAR sztmp[128] = "";
- StringFixer::CopyN(sztmp, pSndFile->m_MixPlugins[m->instr - 1].GetParamName(m->GetValueVolCol()).c_str());
+ mpt::String::CopyN(sztmp, pSndFile->m_MixPlugins[m->instr - 1].GetParamName(m->GetValueVolCol()).c_str());
if (sztmp[0]) wsprintf(s, "%d: %s", m->GetValueVolCol(), sztmp);
}
} else
Modified: trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -210,7 +210,7 @@
{
ToggleBoxes(sfx_preset, sfx);
memcpy(s, m_MidiCfg.szMidiSFXExt[sfx], MACRO_LENGTH);
- StringFixer::SetNullTerminator(s);
+ mpt::String::SetNullTerminator(s);
m_EditSFx.SetWindowText(s);
}
@@ -218,7 +218,7 @@
if(zxx < 0x80)
{
memcpy(s, m_MidiCfg.szMidiZXXExt[zxx], MACRO_LENGTH);
- StringFixer::SetNullTerminator(s);
+ mpt::String::SetNullTerminator(s);
m_EditZxx.SetWindowText(s);
}
UpdateMacroList();
@@ -322,7 +322,7 @@
char s[MACRO_LENGTH];
MemsetZero(s);
m_EditSFx.GetWindowText(s, MACRO_LENGTH);
- StringFixer::SetNullTerminator(s);
+ mpt::String::SetNullTerminator(s);
memcpy(m_MidiCfg.szMidiSFXExt[sfx], s, MACRO_LENGTH);
int sfx_preset = m_MidiCfg.GetParameteredMacroType(sfx);
@@ -345,7 +345,7 @@
char s[MACRO_LENGTH];
MemsetZero(s);
m_EditZxx.GetWindowText(s, MACRO_LENGTH);
- StringFixer::SetNullTerminator(s);
+ mpt::String::SetNullTerminator(s);
memcpy(m_MidiCfg.szMidiZXXExt[zxx], s, MACRO_LENGTH);
m_CbnZxxPreset.SetCurSel(m_MidiCfg.GetFixedMacroType());
}
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -284,7 +284,7 @@
pIns = m_SndFile.Instruments[nIns]; // Reset pIns because ExtractInstrument may delete the previous value.
if ((dwKey >= 24) && (dwKey < 100))
{
- StringFixer::CopyN(pIns->name, szMidiPercussionNames[dwKey - 24]);
+ mpt::String::CopyN(pIns->name, szMidiPercussionNames[dwKey - 24]);
}
bEmbedded = TRUE;
}
@@ -326,7 +326,7 @@
pIns = m_SndFile.Instruments[nIns]; // Reset pIns because ExtractInstrument may delete the previous value.
if ((dwKey >= 24) && (dwKey < 24+61))
{
- StringFixer::CopyN(pIns->name, szMidiPercussionNames[dwKey-24]);
+ mpt::String::CopyN(pIns->name, szMidiPercussionNames[dwKey-24]);
}
}
}
@@ -347,17 +347,17 @@
_splitpath(pszMidiMapName, NULL, NULL, szName, szExt);
strncat(szName, szExt, sizeof(szName));
pIns = m_SndFile.Instruments[nIns];
- if (!pIns->filename[0]) StringFixer::Copy(pIns->filename, szName);
+ if (!pIns->filename[0]) mpt::String::Copy(pIns->filename, szName);
if (!pIns->name[0])
{
if (nMidiCode < 128)
{
- StringFixer::CopyN(pIns->name, szMidiProgramNames[nMidiCode]);
+ mpt::String::CopyN(pIns->name, szMidiProgramNames[nMidiCode]);
} else
{
UINT nKey = nMidiCode & 0x7F;
if (nKey >= 24)
- StringFixer::CopyN(pIns->name, szMidiPercussionNames[nKey - 24]);
+ mpt::String::CopyN(pIns->name, szMidiPercussionNames[nKey - 24]);
}
}
}
@@ -2874,13 +2874,13 @@
//----------------------------
{
// Song title
- StringFixer::FixNullString(m_SndFile.m_szNames[0]);
+ mpt::String::FixNullString(m_SndFile.m_szNames[0]);
// Sample names + filenames
for(SAMPLEINDEX nSmp = 1; nSmp <= m_SndFile.GetNumSamples(); nSmp++)
{
- StringFixer::FixNullString(m_SndFile.m_szNames[nSmp]);
- StringFixer::FixNullString(m_SndFile.GetSample(nSmp).filename);
+ mpt::String::FixNullString(m_SndFile.m_szNames[nSmp]);
+ mpt::String::FixNullString(m_SndFile.GetSample(nSmp).filename);
}
// Instrument names
@@ -2888,15 +2888,15 @@
{
if(m_SndFile.Instruments[nIns] != nullptr)
{
- StringFixer::FixNullString(m_SndFile.Instruments[nIns]->name);
- StringFixer::FixNullString(m_SndFile.Instruments[nIns]->filename);
+ mpt::String::FixNullString(m_SndFile.Instruments[nIns]->name);
+ mpt::String::FixNullString(m_SndFile.Instruments[nIns]->filename);
}
}
// Channel names
for(CHANNELINDEX nChn = 0; nChn < m_SndFile.GetNumChannels(); nChn++)
{
- StringFixer::FixNullString(m_SndFile.ChnSettings[nChn].szName);
+ mpt::String::FixNullString(m_SndFile.ChnSettings[nChn].szName);
}
// Macros
Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/Modedit.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -530,7 +530,7 @@
}
InitializeInstrument(instrument);
- StringFixer::Copy(instrument->name, m_SndFile.m_szNames[smp]);
+ mpt::String::Copy(instrument->name, m_SndFile.m_szNames[smp]);
MuteInstrument(smp, muted);
}
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -157,7 +157,7 @@
CHAR s[_MAX_PATH], *pszCmd, *pszData;
int len;
- StringFixer::CopyN(s, lpszCommand);
+ mpt::String::CopyN(s, lpszCommand);
len = strlen(s) - 1;
while ((len > 0) && (strchr("(){}[]\'\" ", s[len]))) s[len--] = 0;
pszCmd = s;
@@ -699,7 +699,7 @@
{
if(GetModuleFileName(NULL, m_szExePath, CountOf(m_szExePath)))
{
- StringFixer::SetNullTerminator(m_szExePath);
+ mpt::String::SetNullTerminator(m_szExePath);
TCHAR szDrive[_MAX_DRIVE] = "", szDir[_MAX_PATH] = "";
_splitpath(m_szExePath, szDrive, szDir, NULL, NULL);
strcpy(m_szExePath, szDrive);
@@ -2321,7 +2321,7 @@
const size_t nStrLength = nLength - 1; // "usable" length, i.e. not including the null char.
TCHAR szExePath[nLength], szTempPath[nLength];
_tcsncpy(szExePath, GetAppDirPath(), nStrLength);
- StringFixer::SetNullTerminator(szExePath);
+ mpt::String::SetNullTerminator(szExePath);
if(!_tcsncicmp(szExePath, szPath, _tcslen(szExePath)))
{
@@ -2335,7 +2335,7 @@
_tcsncpy(szTempPath, &szPath[2], nStrLength); // "\Somepath"
_tcscpy(szPath, szTempPath);
}
- StringFixer::SetNullTerminator(szPath);
+ mpt::String::SetNullTerminator(szPath);
}
@@ -2355,7 +2355,7 @@
const size_t nStrLength = nLength - 1; // "usable" length, i.e. not including the null char.
TCHAR szExePath[nLength], szTempPath[nLength] = _T("");
_tcsncpy(szExePath, GetAppDirPath(), nStrLength);
- StringFixer::SetNullTerminator(szExePath);
+ mpt::String::SetNullTerminator(szExePath);
if(!_tcsncicmp(szPath, _T("\\"), 1) && _tcsncicmp(szPath, _T("\\\\"), 2))
{
@@ -2373,7 +2373,7 @@
}
_tcscpy(szPath, szTempPath);
}
- StringFixer::SetNullTerminator(szPath);
+ mpt::String::SetNullTerminator(szPath);
}
void CTrackApp::RemoveMruItem(const int nItem)
Modified: trunk/OpenMPT/mptrack/SelectPluginDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/SelectPluginDialog.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/SelectPluginDialog.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -148,8 +148,8 @@
break;
}
- StringFixer::Copy(m_pPlugin->Info.szName, pFactory->szLibraryName);
- StringFixer::Copy(m_pPlugin->Info.szLibraryName, pFactory->szLibraryName);
+ mpt::String::Copy(m_pPlugin->Info.szName, pFactory->szLibraryName);
+ mpt::String::Copy(m_pPlugin->Info.szLibraryName, pFactory->szLibraryName);
cs.Leave();
@@ -165,7 +165,7 @@
if ((p->GetDefaultEffectName(s)) && (s[0]))
{
s[31] = 0;
- StringFixer::Copy(m_pPlugin->Info.szName, s);
+ mpt::String::Copy(m_pPlugin->Info.szName, s);
}
}
}
Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -231,14 +231,14 @@
CHAR snam[8];
wsprintf(snam, "SF%X", isfx);
GetPrivateProfileString("Zxx Macros", snam, macros.szMidiSFXExt[isfx], macros.szMidiSFXExt[isfx], CountOf(macros.szMidiSFXExt[isfx]), iniFile);
- StringFixer::SetNullTerminator(macros.szMidiSFXExt[isfx]);
+ mpt::String::SetNullTerminator(macros.szMidiSFXExt[isfx]);
}
for(int izxx = 0; izxx < 128; izxx++)
{
CHAR snam[8];
wsprintf(snam, "Z%02X", izxx | 0x80);
GetPrivateProfileString("Zxx Macros", snam, macros.szMidiZXXExt[izxx], macros.szMidiZXXExt[izxx], CountOf(macros.szMidiZXXExt[izxx]), iniFile);
- StringFixer::SetNullTerminator(macros.szMidiZXXExt[izxx]);
+ mpt::String::SetNullTerminator(macros.szMidiZXXExt[izxx]);
}
// Fix old nasty broken (non-standard) MIDI configs in INI file.
if(storedVersion >= "1.17" && storedVersion < "1.20")
@@ -504,11 +504,11 @@
GetPrivateProfileStruct("Effects", "EQ_User2", &CEQSetupDlg::gUserPresets[1], sizeof(EQPreset), iniFile);
GetPrivateProfileStruct("Effects", "EQ_User3", &CEQSetupDlg::gUserPresets[2], sizeof(EQPreset), iniFile);
GetPrivateProfileStruct("Effects", "EQ_User4", &CEQSetupDlg::gUserPresets[3], sizeof(EQPreset), iniFile);
- StringFixer::SetNullTerminator(m_EqSettings.szName);
- StringFixer::SetNullTerminator(CEQSetupDlg::gUserPresets[0].szName);
- StringFixer::SetNullTerminator(CEQSetupDlg::gUserPresets[1].szName);
- StringFixer::SetNullTerminator(CEQSetupDlg::gUserPresets[2].szName);
- StringFixer::SetNullTerminator(CEQSetupDlg::gUserPresets[3].szName);
+ mpt::String::SetNullTerminator(m_EqSettings.szName);
+ mpt::String::SetNullTerminator(CEQSetupDlg::gUserPresets[0].szName);
+ mpt::String::SetNullTerminator(CEQSetupDlg::gUserPresets[1].szName);
+ mpt::String::SetNullTerminator(CEQSetupDlg::gUserPresets[2].szName);
+ mpt::String::SetNullTerminator(CEQSetupDlg::gUserPresets[3].szName);
#endif
@@ -556,7 +556,7 @@
if (pEqSettings->Gains[i] > 32) pEqSettings->Gains[i] = 16;
if ((pEqSettings->Freqs[i] < 100) || (pEqSettings->Freqs[i] > 10000)) pEqSettings->Freqs[i] = CEQSetupDlg::gEQPresets[0].Freqs[i];
}
- StringFixer::SetNullTerminator(pEqSettings->szName);
+ mpt::String::SetNullTerminator(pEqSettings->szName);
}
Modified: trunk/OpenMPT/mptrack/Undo.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Undo.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/Undo.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -281,7 +281,7 @@
// Save old sample header
undo.OldSample = oldSample;
- StringFixer::Copy(undo.oldName, sndFile.m_szNames[smp]);
+ mpt::String::Copy(undo.oldName, sndFile.m_szNames[smp]);
undo.changeType = changeType;
if(changeType == sundo_replace)
Modified: trunk/OpenMPT/mptrack/View_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_gen.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/View_gen.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -886,10 +886,10 @@
CSoundFile *pSndFile = pModDoc->GetSoundFile();
GetDlgItemText(IDC_EDIT13, s, 32);
- StringFixer::SetNullTerminator(s);
+ mpt::String::SetNullTerminator(s);
if (strcmp(s, pSndFile->m_MixPlugins[m_nCurrentPlugin].GetName()))
{
- StringFixer::Copy(pSndFile->m_MixPlugins[m_nCurrentPlugin].Info.szName, s);
+ mpt::String::Copy(pSndFile->m_MixPlugins[m_nCurrentPlugin].Info.szName, s);
if(pSndFile->GetModSpecifications().supportsPlugins)
pModDoc->SetModified();
pModDoc->UpdateAllViews(NULL, HINT_MODCHANNELS | (m_nActiveTab << HINT_SHIFT_CHNTAB));
Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/View_tre.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -448,11 +448,11 @@
{
_splitpath(lpMidiLib->MidiMap[iPerc|0x80], NULL, NULL, szName, szExt);
strncat(s, ": ", sizeof(s));
- StringFixer::SetNullTerminator(s);
+ mpt::String::SetNullTerminator(s);
strncat(s, szName, sizeof(s));
- StringFixer::SetNullTerminator(s);
+ mpt::String::SetNullTerminator(s);
strncat(s, szExt, sizeof(s));
- StringFixer::SetNullTerminator(s);
+ mpt::String::SetNullTerminator(s);
if (szName[0]) dwImage = IMAGE_SAMPLES;
}
if (!m_tiPerc[iPerc])
@@ -1324,7 +1324,7 @@
{
// Preview sample / instrument in module
char szName[16];
- StringFixer::CopyN(szName, GetItemText(hItem));
+ mpt::String::CopyN(szName, GetItemText(hItem));
const size_t n = ConvertStrTo<size_t>(szName);
CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
if (pMainFrm && m_SongFile)
@@ -1621,7 +1621,7 @@
ModInstrument *pIns = m_SongFile->Instruments[iIns];
if(pIns)
{
- StringFixer::Copy(szPath, pIns->name);
+ mpt::String::Copy(szPath, pIns->name);
wsprintf(s, "%3d: %s", iIns, szPath);
ModTreeBuildTVIParam(tvis, s, IMAGE_INSTRUMENTS);
InsertItem(&tvis);
@@ -1998,7 +1998,7 @@
if (m_szSongName[0])
{
CHAR s[32];
- StringFixer::CopyN(s, GetItemText(m_hItemDrag));
+ mpt::String::CopyN(s, GetItemText(m_hItemDrag));
UINT n = 0;
if (s[0] >= '0') n += (s[0] - '0');
if ((s[1] >= '0') && (s[1] <= '9')) n = n*10 + (s[1] - '0');
@@ -3616,7 +3616,7 @@
case MODITEM_SAMPLE:
if(modItemID <= sndFile.GetNumSamples() && strcmp(sndFile.m_szNames[modItemID], info->item.pszText))
{
- StringFixer::CopyN(sndFile.m_szNames[modItemID], info->item.pszText, modSpecs.sampleNameLengthMax);
+ mpt::String::CopyN(sndFile.m_szNames[modItemID], info->item.pszText, modSpecs.sampleNameLengthMax);
modDoc->SetModified();
modDoc->UpdateAllViews(NULL, (UINT(modItemID) << HINT_SHIFT_SMP) | HINT_SMPNAMES | HINT_SAMPLEDATA | HINT_SAMPLEINFO);
}
@@ -3625,7 +3625,7 @@
case MODITEM_INSTRUMENT:
if(modItemID <= sndFile.GetNumInstruments() && sndFile.Instruments[modItemID] != nullptr && strcmp(sndFile.Instruments[modItemID]->name, info->item.pszText))
{
- StringFixer::CopyN(sndFile.Instruments[modItemID]->name, info->item.pszText, modSpecs.instrNameLengthMax);
+ mpt::String::CopyN(sndFile.Instruments[modItemID]->name, info->item.pszText, modSpecs.instrNameLengthMax);
modDoc->SetModified();
modDoc->UpdateAllViews(NULL, (UINT(modItemID) << HINT_SHIFT_INS) | HINT_ENVELOPE | HINT_INSTRUMENT);
}
Modified: trunk/OpenMPT/mptrack/VstPresets.cpp
===================================================================
--- trunk/OpenMPT/mptrack/VstPresets.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/VstPresets.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -65,7 +65,7 @@
// Program
PlugParamIndex numParams = file.ReadUint32BE();
char prgName[28];
- file.ReadString<StringFixer::maybeNullTerminated>(prgName, 28);
+ file.ReadString<mpt::String::maybeNullTerminated>(prgName, 28);
plugin.Dispatch(effSetProgramName, 0, 0, prgName, 0.0f);
if(header.fxMagic == fMagic)
Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -51,7 +51,7 @@
//----------------------------------------------
{
char fn[_MAX_PATH];
- StringFixer::Copy(fn, s);
+ mpt::String::Copy(fn, s);
int f;
for(f = 0; fn[f] != 0; f++) fn[f] = toupper(fn[f]);
return LittleEndian(crc32(0, (BYTE *)fn, f));
@@ -162,11 +162,11 @@
p->dwPluginId1 = kDmoMagic;
p->dwPluginId2 = clsid.Data1;
p->category = VSTPluginLib::catDMO;
- StringFixer::Copy(p->szLibraryName, s);
+ mpt::String::Copy(p->szLibraryName, s);
StringFromGUID2(clsid, w, 100);
WideCharToMultiByte(CP_ACP, 0, w, -1, p->szDllPath, sizeof(p->szDllPath), nullptr, nullptr);
- StringFixer::SetNullTerminator(p->szDllPath);
+ mpt::String::SetNullTerminator(p->szDllPath);
#ifdef DMO_LOG
if (theApp.IsDebug()) Log("Found \"%s\" clsid=%s\n", p->szLibraryName, p->szDllPath);
#endif
@@ -304,7 +304,7 @@
{
// Get path from cache file
GetPrivateProfileString(cacheSection, IDs, "", szPath, CountOf(szPath), cacheFile);
- StringFixer::SetNullTerminator(szPath);
+ mpt::String::SetNullTerminator(szPath);
theApp.RelativePathToAbsolute(szPath);
if ((szPath[0]) && (!lstrcmpi(szPath, pszDllPath)))
@@ -438,7 +438,7 @@
{
theApp.AbsolutePathToRelative(szPath);
}
- StringFixer::SetNullTerminator(szPath);
+ mpt::String::SetNullTerminator(szPath);
WritePrivateProfileString(cacheSection, IDs, szPath, cacheFile);
CMainFrame::WritePrivateProfileCString(cacheSection, IDs, pszDllPath, cacheFile);
@@ -551,10 +551,10 @@
{
// Try finding the plugin DLL in the plugin directory instead.
CHAR s[_MAX_PATH];
- StringFixer::CopyN(s, TrackerSettings::Instance().GetDefaultDirectory(DIR_PLUGINS));
+ mpt::String::CopyN(s, TrackerSettings::Instance().GetDefaultDirectory(DIR_PLUGINS));
if(!s[0])
{
- StringFixer::CopyN(s, theApp.GetAppDirPath());
+ mpt::String::CopyN(s, theApp.GetAppDirPath());
}
size_t len = strlen(s);
if((len > 0) && (s[len - 1] != '\\') && (s[len - 1] != '/'))
@@ -564,7 +564,7 @@
strncat(s, mixPlugin.GetLibraryName(), CountOf(s));
strncat(s, ".dll", CountOf(s));
- StringFixer::SetNullTerminator(s);
+ mpt::String::SetNullTerminator(s);
pFound = AddPlugin(s);
if (!pFound)
@@ -1185,7 +1185,7 @@
char szInitPath[_MAX_PATH] = { '\0' };
if(fileSel->initialPath)
{
- StringFixer::CopyN(szInitPath, fileSel->initialPath);
+ mpt::String::CopyN(szInitPath, fileSel->initialPath);
}
char szBuffer[_MAX_PATH];
@@ -1622,7 +1622,7 @@
char rawname[MAX(kVstMaxProgNameLen + 1, 256)] = ""; // kVstMaxProgNameLen is 24...
Dispatch(effGetProgramName, 0, 0, rawname, 0);
SanitizeFilename(rawname);
- StringFixer::SetNullTerminator(rawname);
+ mpt::String::SetNullTerminator(rawname);
FileDlgResult files = CTrackApp::ShowOpenSaveFileDialog(false, "fxp", rawname,
"VST Plugin Programs (*.fxp)|*.fxp|"
"VST Plugin Banks (*.fxb)|*.fxb||",
@@ -1767,7 +1767,7 @@
SetCurrentProgram(curProg);
}
}
- StringFixer::SetNullTerminator(rawname);
+ mpt::String::SetNullTerminator(rawname);
// Let's start counting at 1 for the program name (as most MIDI hardware / software does)
index++;
@@ -1853,7 +1853,7 @@
if(m_Effect.numParams > 0 && param < m_Effect.numParams)
{
Dispatch(opcode, param, 0, s, 0);
- StringFixer::SetNullTerminator(s);
+ mpt::String::SetNullTerminator(s);
}
return CString(s);
}
@@ -1868,7 +1868,7 @@
MemsetZero(properties.label);
if(Dispatch(effGetParameterProperties, param, 0, &properties, 0.0f) == 1)
{
- StringFixer::SetNullTerminator(properties.label);
+ mpt::String::SetNullTerminator(properties.label);
paramName = properties.label;
} else
{
Modified: trunk/OpenMPT/mptrack/Vstplug.h
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.h 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/Vstplug.h 2013-05-21 23:42:33 UTC (rev 2169)
@@ -78,7 +78,7 @@
category = catUnknown;
if(dllPath != nullptr)
{
- StringFixer::CopyN(szDllPath, dllPath);
+ mpt::String::CopyN(szDllPath, dllPath);
}
}
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -447,7 +447,7 @@
//strncpy_s(pTTTA->szText, sizeof(pTTTA->szText), strTipText,
// strTipText.GetLength() + 1);
// 80 chars max?!
- StringFixer::CopyN(pTTTA->szText, strTipText);
+ mpt::String::CopyN(pTTTA->szText, strTipText);
} else
{
::MultiByteToWideChar(CP_ACP , 0, strTipText, strTipText.GetLength() + 1,
Modified: trunk/OpenMPT/mptrack/mod2midi.cpp
===================================================================
--- trunk/OpenMPT/mptrack/mod2midi.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/mod2midi.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -417,7 +417,7 @@
for (CHANNELINDEX iInit = 0; iInit < m_pSndFile->GetNumChannels(); iInit++)
{
DYNMIDITRACK &track = Tracks[iInit];
- StringFixer::Copy(s, m_pSndFile->ChnSettings[iInit].szName);
+ mpt::String::Copy(s, m_pSndFile->ChnSettings[iInit].szName);
track.nMidiChannel = iInit & 7;
if (s[0])
{
Modified: trunk/OpenMPT/mptrack/test/test.cpp
===================================================================
--- trunk/OpenMPT/mptrack/test/test.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/test/test.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -1087,13 +1087,13 @@
char dst2[3]; // Destination buffer, smaller than source buffer
#define ReadTest(mode, dst, src, expectedResult) \
- StringFixer::ReadString<StringFixer::##mode>(dst, src); \
+ mpt::String::Read<mpt::String::##mode>(dst, src); \
VERIFY_EQUAL_NONCONT(strncmp(dst, expectedResult, CountOf(dst)), 0); /* Ensure that the strings are identical */ \
for(size_t i = strlen(dst); i < CountOf(dst); i++) \
VERIFY_EQUAL_NONCONT(dst[i], '\0'); /* Ensure that rest of the buffer is completely nulled */
#define WriteTest(mode, dst, src, expectedResult) \
- StringFixer::WriteString<StringFixer::##mode>(dst, src); \
+ mpt::String::Write<mpt::String::##mode>(dst, src); \
VERIFY_EQUAL_NONCONT(strncmp(dst, expectedResult, CountOf(dst)), 0); /* Ensure that the strings are identical */ \
for(size_t i = strlen(dst); i < CountOf(dst); i++) \
VERIFY_EQUAL_NONCONT(dst[i], '\0'); /* Ensure that rest of the buffer is completely nulled */
@@ -1187,9 +1187,9 @@
///////////////////////////////
// Test FixNullString()
- StringFixer::FixNullString(src1);
- StringFixer::FixNullString(src2);
- StringFixer::FixNullString(src3);
+ mpt::String::FixNullString(src1);
+ mpt::String::FixNullString(src2);
+ mpt::String::FixNullString(src3);
VERIFY_EQUAL_NONCONT(strncmp(src1, "X ", CountOf(src1)), 0);
VERIFY_EQUAL_NONCONT(strncmp(src2, "XYZ", CountOf(src2)), 0);
VERIFY_EQUAL_NONCONT(strncmp(src3, "XYZ", CountOf(src3)), 0);
Modified: trunk/OpenMPT/mptrack/view_com.cpp
===================================================================
--- trunk/OpenMPT/mptrack/view_com.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/mptrack/view_com.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -275,7 +275,7 @@
switch(iCol)
{
case SMPLIST_SAMPLENAME:
- StringFixer::Copy(s, pSndFile->m_szNames[iSmp + 1]);
+ mpt::String::Copy(s, pSndFile->m_szNames[iSmp + 1]);
break;
case SMPLIST_SAMPLENO:
wsprintf(s, "%02d", iSmp + 1);
@@ -375,7 +375,7 @@
switch(iCol)
{
case INSLIST_INSTRUMENTNAME:
- if (pIns) StringFixer::Copy(s, pIns->name);
+ if (pIns) mpt::String::Copy(s, pIns->name);
break;
case INSLIST_INSTRUMENTNO:
wsprintf(s, "%02d", iIns+1);
@@ -527,7 +527,7 @@
{
if(iItem < pSndFile->GetNumSamples())
{
- StringFixer::CopyN(pSndFile->m_szNames[iItem + 1], lvItem.pszText);
+ mpt::String::CopyN(pSndFile->m_szNames[iItem + 1], lvItem.pszText);
pModDoc->UpdateAllViews(this, ((iItem + 1) << HINT_SHIFT_SMP) | (HINT_SMPNAMES | HINT_SAMPLEINFO), this);
pModDoc->SetModified();
}
@@ -536,7 +536,7 @@
if((iItem < pSndFile->GetNumInstruments()) && (pSndFile->Instruments[iItem + 1]))
{
ModInstrument *pIns = pSndFile->Instruments[iItem + 1];
- StringFixer::CopyN(pIns->name, lvItem.pszText);
+ mpt::String::CopyN(pIns->name, lvItem.pszText);
pModDoc->UpdateAllViews(this, ((iItem + 1) << HINT_SHIFT_INS) | (HINT_INSNAMES | HINT_INSTRUMENT), this);
pModDoc->SetModified();
}
Modified: trunk/OpenMPT/soundlib/Dlsbank.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/Dlsbank.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -923,7 +923,7 @@
SFSAMPLE *p = (SFSAMPLE *)(pchunk+1);
for (UINT i=0; i<m_nSamplesEx; i++, pDlsSmp++, p++)
{
- StringFixer::Copy(pDlsSmp->szName, p->achSampleName);
+ mpt::String::Copy(pDlsSmp->szName, p->achSampleName);
pDlsSmp->dwLen = 0;
pDlsSmp->dwSampleRate = p->dwSampleRate;
pDlsSmp->byOriginalPitch = p->byOriginalPitch;
@@ -1731,10 +1731,10 @@
}
lstrcat(s, ")");
}
- StringFixer::Copy(pIns->name, s);
+ mpt::String::Copy(pIns->name, s);
} else
{
- StringFixer::Copy(pIns->name, pDlsIns->szName);
+ mpt::String::Copy(pIns->name, pDlsIns->szName);
}
int nTranspose = 0;
if (pDlsIns->ulBank & F_INSTRUMENT_DRUMS)
Modified: trunk/OpenMPT/soundlib/FileReader.h
===================================================================
--- trunk/OpenMPT/soundlib/FileReader.h 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/FileReader.h 2013-05-21 23:42:33 UTC (rev 2169)
@@ -758,12 +758,12 @@
// Read a string of length srcSize into fixed-length char array destBuffer using a given read mode.
// The file cursor is advanced by "srcSize" bytes.
- template<StringFixer::ReadWriteMode mode, off_t destSize>
+ template<mpt::String::ReadWriteMode mode, off_t destSize>
bool ReadString(char (&destBuffer)[destSize], const off_t srcSize)
{
if(CanRead(srcSize))
{
- StringFixer::ReadString<mode, destSize>(destBuffer, DataContainer().GetPartialRawData(streamPos, srcSize), srcSize);
+ mpt::String::Read<mode, destSize>(destBuffer, DataContainer().GetPartialRawData(streamPos, srcSize), srcSize);
streamPos += srcSize;
return true;
} else
Modified: trunk/OpenMPT/soundlib/ITTools.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ITTools.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/ITTools.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -134,8 +134,8 @@
return;
}
- StringFixer::ReadString<StringFixer::spacePadded>(mptIns.name, name);
- StringFixer::ReadString<StringFixer::nullTerminated>(mptIns.filename, filename);
+ mpt::String::Read<mpt::String::spacePadded>(mptIns.name, name);
+ mpt::String::Read<mpt::String::nullTerminated>(mptIns.filename, filename);
// Volume / Panning
mptIns.nFadeOut = fadeout << 6;
@@ -214,8 +214,8 @@
id = ITInstrument::magic;
trkvers = 0x0214;
- StringFixer::WriteString<StringFixer::nullTerminated>(filename, mptIns.filename);
- StringFixer::WriteString<StringFixer::nullTerminated>(name, mptIns.name);
+ mpt::String::Write<mpt::String::nullTerminated>(filename, mptIns.filename);
+ mpt::String::Write<mpt::String::nullTerminated>(name, mptIns.name);
// Volume / Panning
fadeout = static_cast<uint16>(MIN(mptIns.nFadeOut >> 5, 256));
@@ -295,8 +295,8 @@
return 0;
}
- StringFixer::ReadString<StringFixer::spacePadded>(mptIns.name, name);
- StringFixer::ReadString<StringFixer::nullTerminated>(mptIns.filename, filename);
+ mpt::String::Read<mpt::String::spacePadded>(mptIns.name, name);
+ mpt::String::Read<mpt::String::nullTerminated>(mptIns.filename, filename);
// Volume / Panning
mptIns.nFadeOut = fadeout << 5;
@@ -476,8 +476,8 @@
// Header
id = ITSample::magic;
- StringFixer::WriteString<StringFixer::nullTerminated>(filename, mptSmp.filename);
- //StringFixer::WriteString<StringFixer::nullTerminated>(name, m_szNames[nsmp]);
+ mpt::String::Write<mpt::String::nullTerminated>(filename, mptSmp.filename);
+ //mpt::String::Write<mpt::String::nullTerminated>(name, m_szNames[nsmp]);
// Volume / Panning
gvl = static_cast<uint8>(mptSmp.nGlobalVol);
@@ -552,7 +552,7 @@
}
mptSmp.Initialize(MOD_TYPE_IT);
- StringFixer::ReadString<StringFixer::nullTerminated>(mptSmp.filename, filename);
+ mpt::String::Read<mpt::String::nullTerminated>(mptSmp.filename, filename);
// Volume / Panning
mptSmp.nVolume = vol * 4;
Modified: trunk/OpenMPT/soundlib/LOAD_AMF.CPP
===================================================================
--- trunk/OpenMPT/soundlib/LOAD_AMF.CPP 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/LOAD_AMF.CPP 2013-05-21 23:42:33 UTC (rev 2169)
@@ -138,7 +138,7 @@
AsylumSampleHeader sampleHeader;
file.ReadConvertEndianness(sampleHeader);
sampleHeader.ConvertToMPT(Samples[smp]);
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(m_szNames[smp], sampleHeader.name);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(m_szNames[smp], sampleHeader.name);
}
file.Skip((64 - fileHeader.numSamples) * sizeof(AsylumSampleHeader));
@@ -385,7 +385,7 @@
m_nChannels = fileHeader.numChannels;
m_nSamples = fileHeader.numSamples;
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(m_szNames[0], fileHeader.title);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(m_szNames[0], fileHeader.title);
if(fileHeader.version < 10)
{
@@ -463,8 +463,8 @@
sample.Initialize();
uint8 type = file.ReadUint8();
- file.ReadString<StringFixer::maybeNullTerminated>(m_szNames[smp], 32);
- file.ReadString<StringFixer::nullTerminated>(sample.filename, 13);
+ file.ReadString<mpt::String::maybeNullTerminated>(m_szNames[smp], 32);
+ file.ReadString<mpt::String::nullTerminated>(sample.filename, 13);
samplePos[smp - 1] = file.ReadUint32LE();
if(fileHeader.version < 10)
{
Modified: trunk/OpenMPT/soundlib/LOAD_DBM.CPP
===================================================================
--- trunk/OpenMPT/soundlib/LOAD_DBM.CPP 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/LOAD_DBM.CPP 2013-05-21 23:42:33 UTC (rev 2169)
@@ -227,10 +227,10 @@
if(pfh->songname[0])
{
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(m_szNames[0], pfh->songname);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(m_szNames[0], pfh->songname);
} else
{
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(m_szNames[0], pfh->songname2);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(m_szNames[0], pfh->songname2);
}
@@ -274,10 +274,10 @@
break;
}
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(pIns->name, pih->name);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(pIns->name, pih->name);
if (psmp)
{
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(m_szNames[nsmp], pih->name);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(m_szNames[nsmp], pih->name);
}
pIns->nFadeOut = 1024; // ???
Modified: trunk/OpenMPT/soundlib/LOAD_DMF.CPP
===================================================================
--- trunk/OpenMPT/soundlib/LOAD_DMF.CPP 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/LOAD_DMF.CPP 2013-05-21 23:42:33 UTC (rev 2169)
@@ -975,7 +975,7 @@
}
InitializeGlobals();
- StringFixer::ReadString<StringFixer::spacePadded>(m_szNames[0], fileHeader.songname);
+ mpt::String::Read<mpt::String::spacePadded>(m_szNames[0], fileHeader.songname);
#ifdef MODPLUG_TRACKER
if(GetpModDoc() != nullptr)
@@ -1067,7 +1067,7 @@
for(SAMPLEINDEX smp = 1; smp <= GetNumSamples(); smp++)
{
- chunk.ReadString<StringFixer::spacePadded>(m_szNames[smp], chunk.ReadUint8());
+ chunk.ReadString<mpt::String::spacePadded>(m_szNames[smp], chunk.ReadUint8());
DMFSampleHeader sampleHeader;
ModSample &sample = Samples[smp];
chunk.ReadConvertEndianness(sampleHeader);
@@ -1076,7 +1076,7 @@
if(fileHeader.version >= 8)
{
// Read library name in version 8 files
- chunk.ReadString<StringFixer::spacePadded>(sample.filename, 8);
+ chunk.ReadString<mpt::String::spacePadded>(sample.filename, 8);
}
// We don't care for the checksum of the sample data...
Modified: trunk/OpenMPT/soundlib/LOAD_DSM.CPP
===================================================================
--- trunk/OpenMPT/soundlib/LOAD_DSM.CPP 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/LOAD_DSM.CPP 2013-05-21 23:42:33 UTC (rev 2169)
@@ -146,7 +146,7 @@
}
}
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(m_szNames[0], psong->songname);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(m_szNames[0], psong->songname);
nPat = 0;
nSmp = 1;
@@ -244,8 +244,8 @@
ModSample &sample = Samples[nSmp];
sample.Initialize();
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(m_szNames[nSmp], pSmp->samplename);
- StringFixer::ReadString<StringFixer::nullTerminated>(sample.filename, pSmp->filename);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(m_szNames[nSmp], pSmp->samplename);
+ mpt::String::Read<mpt::String::nullTerminated>(sample.filename, pSmp->filename);
sample.nC5Speed = pSmp->c2spd;
sample.uFlags.set(CHN_LOOP, (pSmp->flags & 1) != 0);
Modified: trunk/OpenMPT/soundlib/Load_669.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_669.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/Load_669.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -130,11 +130,11 @@
return false;
}
sampleHeader.ConvertToMPT(Samples[smp]);
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(m_szNames[smp], sampleHeader.filename);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(m_szNames[smp], sampleHeader.filename);
}
// Copy first song message line into song title
- StringFixer::ReadString<StringFixer::spacePadded>(m_szNames[0], fileHeader.songMessage, 36);
+ mpt::String::Read<mpt::String::spacePadded>(m_szNames[0], fileHeader.songMessage, 36);
// Song Message
songMessage.ReadFixedLineLength(fileHeader.songMessage, 108, 36, 0);
Modified: trunk/OpenMPT/soundlib/Load_ams.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ams.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/Load_ams.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -43,7 +43,7 @@
//----------------------------------------------------------------
{
const size_t length = file.ReadUint8();
- return file.ReadString<StringFixer::spacePadded>(destBuffer, length);
+ return file.ReadString<mpt::String::spacePadded>(destBuffer, length);
}
Modified: trunk/OpenMPT/soundlib/Load_digi.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_digi.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/Load_digi.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -139,10 +139,10 @@
}
// Read song + sample names
- file.ReadString<StringFixer::maybeNullTerminated>(m_szNames[0], 32);
+ file.ReadString<mpt::String::maybeNullTerminated>(m_szNames[0], 32);
for(SAMPLEINDEX smp = 1; smp <= 31; smp++)
{
- file.ReadString<StringFixer::maybeNullTerminated>(m_szNames[smp], 30);
+ file.ReadString<mpt::String::maybeNullTerminated>(m_szNames[smp], 30);
}
for(PATTERNINDEX pat = 0; pat <= fileHeader.lastPatIndex; pat++)
Modified: trunk/OpenMPT/soundlib/Load_far.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_far.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/Load_far.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -158,7 +158,7 @@
m_nDefaultTempo = 80;
m_nDefaultGlobalVolume = MAX_GLOBAL_VOLUME;
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(m_szNames[0], fileHeader.songName);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(m_szNames[0], fileHeader.songName);
// Read channel settings
for(CHANNELINDEX chn = 0; chn < 16; chn++)
@@ -313,7 +313,7 @@
m_nSamples = smp + 1;
ModSample &sample = Samples[m_nSamples];
- StringFixer::ReadString<StringFixer::nullTerminated>(m_szNames[m_nSamples], sampleHeader.name);
+ mpt::String::Read<mpt::String::nullTerminated>(m_szNames[m_nSamples], sampleHeader.name);
sampleHeader.ConvertToMPT(sample);
sampleHeader.GetSampleFormat().ReadSample(sample, file);
}
Modified: trunk/OpenMPT/soundlib/Load_gdm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_gdm.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/Load_gdm.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -161,7 +161,7 @@
madeWithTracker = mpt::String::Format("BWSB 2GDM %d.%d (converted from %s)", fileHeader.trackerMajorVer, fileHeader.formatMinorVer, ModTypeToTracker(GetType()).c_str());
// Song name
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(m_szNames[0], fileHeader.songTitle);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(m_szNames[0], fileHeader.songTitle);
// Read channel pan map... 0...15 = channel panning, 16 = surround channel, 255 = channel does not exist
m_nChannels = 32;
@@ -209,8 +209,8 @@
break;
}
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(m_szNames[smp], gdmSample.name);
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(Samples[smp].filename, gdmSample.fileName);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(m_szNames[smp], gdmSample.name);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(Samples[smp].filename, gdmSample.fileName);
Samples[smp].nC5Speed = gdmSample.c4Hertz;
Samples[smp].nGlobalVol = 256; // Not supported in this format
Modified: trunk/OpenMPT/soundlib/Load_imf.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_imf.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/Load_imf.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -136,7 +136,7 @@
// Convert an IMFInstrument to OpenMPT's internal instrument representation.
void ConvertToMPT(ModInstrument &mptIns, SAMPLEINDEX firstSample) const
{
- StringFixer::ReadString<StringFixer::nullTerminated>(mptIns.name, name);
+ mpt::String::Read<mpt::String::nullTerminated>(mptIns.name, name);
if(smpNum)
{
@@ -207,7 +207,7 @@
void ConvertToMPT(ModSample &mptSmp) const
{
mptSmp.Initialize();
- StringFixer::ReadString<StringFixer::nullTerminated>(mptSmp.filename, filename);
+ mpt::String::Read<mpt::String::nullTerminated>(mptSmp.filename, filename);
mptSmp.nLength = length;
mptSmp.nLoopStart = loopStart;
@@ -413,7 +413,7 @@
ChnSettings[chn].Reset();
ChnSettings[chn].nPan = fileHeader.channels[chn].panning * 256 / 255;
- StringFixer::ReadString<StringFixer::nullTerminated>(ChnSettings[chn].szName, fileHeader.channels[chn].name);
+ mpt::String::Read<mpt::String::nullTerminated>(ChnSettings[chn].szName, fileHeader.channels[chn].name);
// TODO: reverb/chorus?
switch(fileHeader.channels[chn].status)
@@ -461,7 +461,7 @@
SetModFlag(MSF_COMPATIBLE_PLAY, true);
// Song Name
- StringFixer::ReadString<StringFixer::nullTerminated>(m_szNames[0], fileHeader.title);
+ mpt::String::Read<mpt::String::nullTerminated>(m_szNames[0], fileHeader.title);
m_SongFlags = (fileHeader.flags & IMFFileHeader::linearSlides) ? SONG_LINEARSLIDES : SongFlags(0);
m_nDefaultSpeed = fileHeader.tempo;
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -278,7 +278,7 @@
//--------------------------------------------------------------
{
char name[MAX_PATTERNNAME] = "";
- file.ReadString<StringFixer::maybeNullTerminated>(name, MAX_PATTERNNAME);
+ file.ReadString<mpt::String::maybeNullTerminated>(name, MAX_PATTERNNAME);
pattern.SetName(name);
}
@@ -438,7 +438,7 @@
m_SongFlags.set(SONG_EMBEDMIDICFG, (fileHeader.flags & ITFileHeader::reqEmbeddedMIDIConfig) || (fileHeader.special & ITFileHeader::embedMIDIConfiguration));
m_SongFlags.set(SONG_EXFILTERRANGE, (fileHeader.flags & ITFileHeader::extendedFilterRange) != 0);
- StringFixer::ReadString<StringFixer::spacePadded>(m_szNames[0], fileHeader.songname);
+ mpt::String::Read<mpt::String::spacePadded>(m_szNames[0], fileHeader.songname);
// Global Volume
m_nDefaultGlobalVolume = fileHeader.globalvol << 1;
@@ -599,7 +599,7 @@
for(CHANNELINDEX i = 0; i < readChns; i++)
{
- chnNames.ReadString<StringFixer::maybeNullTerminated>(ChnSettings[i].szName, MAX_CHANNELNAME);
+ chnNames.ReadString<mpt::String::maybeNullTerminated>(ChnSettings[i].szName, MAX_CHANNELNAME);
}
}
@@ -661,7 +661,7 @@
{
size_t sampleOffset = sampleHeader.ConvertToMPT(Samples[i + 1]);
- StringFixer::ReadString<StringFixer::spacePadded>(m_szNames[i + 1], sampleHeader.name);
+ mpt::String::Read<mpt::String::spacePadded>(m_szNames[i + 1], sampleHeader.name);
if((loadFlags & loadSampleData) && file.Seek(sampleOffset))
{
@@ -1117,7 +1117,7 @@
MemsetZero(itHeader);
dwChnNamLen = 0;
itHeader.id = ITFileHeader::itMagic;
- StringFixer::WriteString<StringFixer::nullTerminated>(itHeader.songname, m_szNames[0]);
+ mpt::String::Write<mpt::String::nullTerminated>(itHeader.songname, m_szNames[0]);
itHeader.highlight_minor = (uint8)std::min(m_nDefaultRowsPerBeat, ROWINDEX(uint8_max));
itHeader.highlight_major = (uint8)std::min(m_nDefaultRowsPerMeasure, ROWINDEX(uint8_max));
@@ -1562,7 +1562,7 @@
// Old MPT will only consider the IT2.15 compression flag if the header version also indicates IT2.15.
itss.ConvertToIT(Samples[nsmp], GetType(), compress, itHeader.cmwt >= 0x215);
- StringFixer::WriteString<StringFixer::nullTerminated>(itss.name, m_szNames[nsmp]);
+ mpt::String::Write<mpt::String::nullTerminated>(itss.name, m_szNames[nsmp]);
itss.samplepointer = dwPos;
itss.ConvertEndianness();
@@ -1771,8 +1771,8 @@
{
// MPT's standard plugin data. Size not specified in file.. grrr..
chunk.ReadConvertEndianness(m_MixPlugins[plug].Info);
- StringFixer::SetNullTerminator(m_MixPlugins[plug].Info.szName);
- StringFixer::SetNullTerminator(m_MixPlugins[plug].Info.szLibraryName);
+ mpt::String::SetNullTerminator(m_MixPlugins[plug].Info.szName);
+ mpt::String::SetNullTerminator(m_MixPlugins[plug].Info.szLibraryName);
//data for VST setchunk? size lies just after standard plugin data.
FileReader pluginDataChunk = chunk.GetChunk(chunk.ReadUint32LE());
Modified: trunk/OpenMPT/soundlib/Load_itp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_itp.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/Load_itp.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -31,7 +31,7 @@
bool ReadITPString(char (&destBuffer)[destSize], FileReader &file)
//----------------------------------------------------------------
{
- return file.ReadString<StringFixer::maybeNullTerminated>(destBuffer, file.ReadUint32LE());
+ return file.ReadString<mpt::String::maybeNullTerminated>(destBuffer, file.ReadUint32LE());
}
@@ -92,7 +92,7 @@
ChnSettings[chn].nPan = static_cast<uint16>(file.ReadUint32LE());
ChnSettings[chn].dwFlags = static_cast<ChannelFlags>(file.ReadUint32LE());
ChnSettings[chn].nVolume = static_cast<uint16>(file.ReadUint32LE());
- file.ReadString<StringFixer::maybeNullTerminated>(ChnSettings[chn].szName, size);
+ file.ReadString<mpt::String::maybeNullTerminated>(ChnSettings[chn].szName, size);
}
// Song mix plugins
@@ -123,7 +123,7 @@
for(INSTRUMENTINDEX ins = 0; ins < GetNumInstruments(); ins++)
{
char path[_MAX_PATH];
- file.ReadString<StringFixer::maybeNullTerminated>(path, size);
+ file.ReadString<mpt::String::maybeNullTerminated>(path, size);
m_szInstrumentPath[ins] = path;
}
@@ -160,7 +160,7 @@
if(pat < numNamedPats)
{
char patName[MAX_PATTERNNAME];
- pattNames.ReadString<StringFixer::maybeNullTerminated>(patName, patNameLen);
+ pattNames.ReadString<mpt::String::maybeNullTerminated>(patName, patNameLen);
Patterns[pat].SetName(patName);
}
@@ -199,7 +199,7 @@
if(realSample >= 1 && realSample < MAX_SAMPLES && sampleHeader.id == ITSample::magic)
{
sampleHeader.ConvertToMPT(Samples[realSample]);
- StringFixer::ReadString<StringFixer::nullTerminated>(m_szNames[realSample], sampleHeader.name);
+ mpt::String::Read<mpt::String::nullTerminated>(m_szNames[realSample], sampleHeader.name);
// Read sample data
sampleHeader.GetSampleFormat().ReadSample(Samples[realSample], file);
@@ -473,7 +473,7 @@
ITSample itss;
itss.ConvertToIT(Samples[nsmp], GetType(), false, false);
- StringFixer::WriteString<StringFixer::nullTerminated>(itss.name, m_szNames[nsmp]);
+ mpt::String::Write<mpt::String::nullTerminated>(itss.name, m_szNames[nsmp]);
id = nsmp;
fwrite(&id, 1, sizeof(id), f);
Modified: trunk/OpenMPT/soundlib/Load_mdl.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mdl.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/Load_mdl.cpp 2013-05-21 23:42:33 UTC (rev 2169)
@@ -338,7 +338,7 @@
Log("infoblock: %d bytes\n", blocklen);
#endif
pmib = (MDLInfoBlock *)(lpStream+dwMemPos);
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(m_szNames[0], pmib->songname);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(m_szNames[0], pmib->songname);
norders = pmib->norders;
if (norders > MAX_ORDERS) norders = MAX_ORDERS;
@@ -439,7 +439,7 @@
}
// I give up. better rewrite this crap (or take SchismTracker's MDL loader).
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(pIns->name, reinterpret_cast<const char *>(lpStream + dwPos + 2), 32);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(pIns->name, reinterpret_cast<const char *>(lpStream + dwPos + 2), 32);
for (j=0; j<lpStream[dwPos+1]; j++)
{
@@ -531,8 +531,8 @@
}
ModSample &sample = Samples[info->sampleIndex];
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(m_szNames[info->sampleIndex], info->name);
- StringFixer::ReadString<StringFixer::maybeNullTerminated>(sample.filename, info->filename);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(m_szNames[info->sampleIndex], info->name);
+ mpt::String::Read<mpt::String::maybeNullTerminated>(sample.filename, info->filename);
if(pmsh->version > 0)
{
Modified: trunk/OpenMPT/soundlib/Load_med.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_med.cpp 2013-05-21 23:01:00 UTC (rev 2168)
+++ trunk/OpenMPT/soundlib/Loa...
[truncated message content] |
