Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4346] trunk/OpenMPT
|
From: <man...@us...> - 2014-10-01 13:44:03
|
Revision: 4346
http://sourceforge.net/p/modplug/code/4346
Author: manxorist
Date: 2014-10-01 13:43:56 +0000 (Wed, 01 Oct 2014)
Log Message:
-----------
[Ref] Convert all std::wstring in soundlib/ to mpt::ustring.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Mod2wave.cpp
trunk/OpenMPT/mptrack/Mpdlgs.cpp
trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp
trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
trunk/OpenMPT/mptrack/mod2wave.h
trunk/OpenMPT/soundlib/Dither.cpp
trunk/OpenMPT/soundlib/Dither.h
trunk/OpenMPT/soundlib/SampleFormats.cpp
trunk/OpenMPT/soundlib/Tagging.cpp
trunk/OpenMPT/soundlib/Tagging.h
trunk/OpenMPT/soundlib/WAVTools.cpp
trunk/OpenMPT/soundlib/WAVTools.h
Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mod2wave.cpp 2014-10-01 13:28:43 UTC (rev 4345)
+++ trunk/OpenMPT/mptrack/Mod2wave.cpp 2014-10-01 13:43:56 UTC (rev 4346)
@@ -78,32 +78,32 @@
}
-static std::wstring GetDefaultArtist()
+static mpt::ustring GetDefaultArtist()
//------------------------------------
{
if(std::getenv("USERNAME"))
{
- return mpt::ToWide(mpt::CharsetLocale, std::getenv("USERNAME"));
+ return mpt::ToUnicode(mpt::CharsetLocale, std::getenv("USERNAME"));
}
- return std::wstring();
+ return mpt::ustring();
}
-static std::wstring GetDefaultYear()
+static mpt::ustring GetDefaultYear()
//----------------------------------
{
- return mpt::ToWide(CTime::GetCurrentTime().Format("%Y"));
+ return mpt::ToUnicode(CTime::GetCurrentTime().Format("%Y"));
}
StoredTags::StoredTags(SettingsContainer &conf)
//---------------------------------------------
: artist(conf, "Export", "TagArtist", GetDefaultArtist())
- , album(conf, "Export", "TagAlbum", L"")
- , trackno(conf, "Export", "TagTrackNo", L"")
+ , album(conf, "Export", "TagAlbum", MPT_USTRING(""))
+ , trackno(conf, "Export", "TagTrackNo", MPT_USTRING(""))
, year(conf, "Export", "TagYear", GetDefaultYear())
- , url(conf, "Export", "TagURL", L"")
- , genre(conf, "Export", "TagGenre", L"")
+ , url(conf, "Export", "TagURL", MPT_USTRING(""))
+ , genre(conf, "Export", "TagGenre", MPT_USTRING(""))
{
return;
}
@@ -239,8 +239,8 @@
void CWaveConvert::LoadTags()
//---------------------------
{
- m_Settings.Tags.title = mpt::ToWide(mpt::CharsetLocale, m_SndFile.GetTitle());
- m_Settings.Tags.comments = mpt::ToWide(mpt::CharsetLocale, m_SndFile.songMessage.GetFormatted(SongMessage::leLF));
+ m_Settings.Tags.title = mpt::ToUnicode(mpt::CharsetLocale, m_SndFile.GetTitle());
+ m_Settings.Tags.comments = mpt::ToUnicode(mpt::CharsetLocale, m_SndFile.songMessage.GetFormatted(SongMessage::leLF));
m_Settings.Tags.artist = m_Settings.storedTags.artist;
m_Settings.Tags.album = m_Settings.storedTags.album;
m_Settings.Tags.trackno = m_Settings.storedTags.trackno;
@@ -539,7 +539,7 @@
m_CbnDither.EnableWindow(TRUE);
for(int dither = 0; dither < NumDitherModes; ++dither)
{
- int ndx = m_CbnDither.AddString(mpt::ToCString(Dither::GetModeName((DitherMode)dither) + L" dither"));
+ int ndx = m_CbnDither.AddString(mpt::ToCString(Dither::GetModeName((DitherMode)dither) + MPT_USTRING(" dither")));
m_CbnDither.SetItemData(ndx, dither);
}
} else
@@ -547,7 +547,7 @@
m_CbnDither.EnableWindow(FALSE);
for(int dither = 0; dither < NumDitherModes; ++dither)
{
- int ndx = m_CbnDither.AddString(mpt::ToCString(Dither::GetModeName(DitherNone) + L" dither"));
+ int ndx = m_CbnDither.AddString(mpt::ToCString(Dither::GetModeName(DitherNone) + MPT_USTRING(" dither")));
m_CbnDither.SetItemData(ndx, dither);
}
}
@@ -735,40 +735,40 @@
CString tmp;
m_EditTitle.GetWindowText(tmp);
- m_Settings.Tags.title = mpt::ToWide(tmp);
+ m_Settings.Tags.title = mpt::ToUnicode(tmp);
m_EditAuthor.GetWindowText(tmp);
- m_Settings.Tags.artist = mpt::ToWide(tmp);
+ m_Settings.Tags.artist = mpt::ToUnicode(tmp);
m_EditAlbum.GetWindowText(tmp);
- m_Settings.Tags.album = mpt::ToWide(tmp);
+ m_Settings.Tags.album = mpt::ToUnicode(tmp);
m_EditURL.GetWindowText(tmp);
- m_Settings.Tags.url = mpt::ToWide(tmp);
+ m_Settings.Tags.url = mpt::ToUnicode(tmp);
if((encTraits->modesWithFixedGenres & encSettings.Mode) && !encTraits->genres.empty())
{
m_CbnGenre.GetWindowText(tmp);
- m_Settings.Tags.genre = mpt::ToWide(tmp);
+ m_Settings.Tags.genre = mpt::ToUnicode(tmp);
} else
{
m_EditGenre.GetWindowText(tmp);
- m_Settings.Tags.genre = mpt::ToWide(tmp);
+ m_Settings.Tags.genre = mpt::ToUnicode(tmp);
}
m_EditYear.GetWindowText(tmp);
- m_Settings.Tags.year = mpt::ToWide(tmp);
- if(m_Settings.Tags.year == L"0")
+ m_Settings.Tags.year = mpt::ToUnicode(tmp);
+ if(m_Settings.Tags.year == MPT_USTRING("0"))
{
- m_Settings.Tags.year = std::wstring();
+ m_Settings.Tags.year = mpt::ustring();
}
if(!m_SndFile.songMessage.empty())
{
- m_Settings.Tags.comments = mpt::ToWide(mpt::CharsetLocale, m_SndFile.songMessage.GetFormatted(SongMessage::leLF));
+ m_Settings.Tags.comments = mpt::ToUnicode(mpt::CharsetLocale, m_SndFile.songMessage.GetFormatted(SongMessage::leLF));
}
- m_Settings.Tags.bpm = mpt::ToWString(m_SndFile.GetCurrentBPM());
+ m_Settings.Tags.bpm = mpt::ToUString(m_SndFile.GetCurrentBPM());
SaveTags();
Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2014-10-01 13:28:43 UTC (rev 4345)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2014-10-01 13:43:56 UTC (rev 4346)
@@ -524,19 +524,19 @@
m_CbnDither.EnableWindow(TRUE);
for(int i=0; i<NumDitherModes; ++i)
{
- m_CbnDither.AddString(mpt::ToCString(Dither::GetModeName((DitherMode)i) + L" dithering"));
+ m_CbnDither.AddString(mpt::ToCString(Dither::GetModeName((DitherMode)i) + MPT_USTRING(" dithering")));
}
} else if(m_CurrentDeviceCaps.HasInternalDither)
{
m_CbnDither.EnableWindow(TRUE);
- m_CbnDither.AddString(mpt::ToCString(Dither::GetModeName(DitherNone) + L" dithering"));
- m_CbnDither.AddString(mpt::ToCString(Dither::GetModeName(DitherDefault) + L" dithering"));
+ m_CbnDither.AddString(mpt::ToCString(Dither::GetModeName(DitherNone) + MPT_USTRING(" dithering")));
+ m_CbnDither.AddString(mpt::ToCString(Dither::GetModeName(DitherDefault) + MPT_USTRING(" dithering")));
} else
{
m_CbnDither.EnableWindow(FALSE);
for(int i=0; i<NumDitherModes; ++i)
{
- m_CbnDither.AddString(mpt::ToCString(Dither::GetModeName(DitherNone) + L" dithering"));
+ m_CbnDither.AddString(mpt::ToCString(Dither::GetModeName(DitherNone) + MPT_USTRING(" dithering")));
}
}
if(m_Settings.DitherType < 0 || m_Settings.DitherType >= m_CbnDither.GetCount())
Modified: trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp 2014-10-01 13:28:43 UTC (rev 4345)
+++ trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp 2014-10-01 13:43:56 UTC (rev 4346)
@@ -113,7 +113,7 @@
}
ASSERT(!inited && !started);
}
- void AddCommentField(const std::string &field, const std::wstring &data)
+ void AddCommentField(const std::string &field, const mpt::ustring &data)
{
if(!field.empty() && !data.empty())
{
@@ -173,7 +173,7 @@
AddCommentField("ENCODER", tags.encoder);
if(writeTags)
{
- AddCommentField("SOURCEMEDIA",L"tracked music file");
+ AddCommentField("SOURCEMEDIA", MPT_USTRING("tracked music file"));
AddCommentField("TITLE", tags.title );
AddCommentField("ARTIST", tags.artist );
AddCommentField("ALBUM", tags.album );
Modified: trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp 2014-10-01 13:28:43 UTC (rev 4345)
+++ trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp 2014-10-01 13:43:56 UTC (rev 4346)
@@ -322,7 +322,7 @@
std::memcpy(&buf[0], og.body, og.body_len);
WriteBuffer();
}
- void AddCommentField(const std::string &field, const std::wstring &data)
+ void AddCommentField(const std::string &field, const mpt::ustring &data)
{
if(!field.empty() && !data.empty())
{
@@ -484,7 +484,7 @@
AddCommentField("ENCODER", tags.encoder);
if(opus_tags)
{
- AddCommentField("SOURCEMEDIA",L"tracked music file");
+ AddCommentField("SOURCEMEDIA", MPT_USTRING("tracked music file"));
AddCommentField("TITLE", tags.title );
AddCommentField("ARTIST", tags.artist );
AddCommentField("ALBUM", tags.album );
Modified: trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp 2014-10-01 13:28:43 UTC (rev 4345)
+++ trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp 2014-10-01 13:43:56 UTC (rev 4346)
@@ -287,7 +287,7 @@
std::memcpy(&buf[0], og.body, og.body_len);
WriteBuffer();
}
- void AddCommentField(const std::string &field, const std::wstring &data)
+ void AddCommentField(const std::string &field, const mpt::ustring &data)
{
if(!field.empty() && !data.empty())
{
@@ -346,7 +346,7 @@
AddCommentField("ENCODER", tags.encoder);
if(vorbis_tags)
{
- AddCommentField("SOURCEMEDIA",L"tracked music file");
+ AddCommentField("SOURCEMEDIA", MPT_USTRING("tracked music file"));
AddCommentField("TITLE", tags.title );
AddCommentField("ARTIST", tags.artist );
AddCommentField("ALBUM", tags.album );
Modified: trunk/OpenMPT/mptrack/mod2wave.h
===================================================================
--- trunk/OpenMPT/mptrack/mod2wave.h 2014-10-01 13:28:43 UTC (rev 4345)
+++ trunk/OpenMPT/mptrack/mod2wave.h 2014-10-01 13:43:56 UTC (rev 4346)
@@ -23,13 +23,13 @@
struct StoredTags
{
- Setting<std::wstring> artist;
- Setting<std::wstring> album;
- Setting<std::wstring> trackno;
- Setting<std::wstring> year;
- Setting<std::wstring> url;
+ Setting<mpt::ustring> artist;
+ Setting<mpt::ustring> album;
+ Setting<mpt::ustring> trackno;
+ Setting<mpt::ustring> year;
+ Setting<mpt::ustring> url;
- Setting<std::wstring> genre;
+ Setting<mpt::ustring> genre;
StoredTags(SettingsContainer &conf);
Modified: trunk/OpenMPT/soundlib/Dither.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dither.cpp 2014-10-01 13:28:43 UTC (rev 4345)
+++ trunk/OpenMPT/soundlib/Dither.cpp 2014-10-01 13:43:56 UTC (rev 4346)
@@ -23,16 +23,16 @@
// Noise Shaping (Dithering)
-std::wstring Dither::GetModeName(DitherMode mode)
+mpt::ustring Dither::GetModeName(DitherMode mode)
//-----------------------------------------------
{
switch(mode)
{
- case DitherNone : return L"no" ; break;
- case DitherDefault: return L"default"; break;
- case DitherModPlug: return L"0.5 bit"; break;
- case DitherSimple : return L"1 bit" ; break;
- default : return L"" ; break;
+ case DitherNone : return MPT_USTRING("no" ); break;
+ case DitherDefault: return MPT_USTRING("default"); break;
+ case DitherModPlug: return MPT_USTRING("0.5 bit"); break;
+ case DitherSimple : return MPT_USTRING("1 bit" ); break;
+ default : return MPT_USTRING("" ); break;
}
}
Modified: trunk/OpenMPT/soundlib/Dither.h
===================================================================
--- trunk/OpenMPT/soundlib/Dither.h 2014-10-01 13:28:43 UTC (rev 4345)
+++ trunk/OpenMPT/soundlib/Dither.h 2014-10-01 13:43:56 UTC (rev 4346)
@@ -65,7 +65,7 @@
DitherMode GetMode() const;
void Reset();
void Process(int *mixbuffer, std::size_t count, std::size_t channels, int bits);
- static std::wstring GetModeName(DitherMode mode);
+ static mpt::ustring GetModeName(DitherMode mode);
};
Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp 2014-10-01 13:28:43 UTC (rev 4345)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp 2014-10-01 13:43:56 UTC (rev 4346)
@@ -470,8 +470,8 @@
file.WriteExtraInformation(sample, GetType());
FileTags tags;
- tags.title = mpt::ToWide(mpt::CharsetLocale, m_szNames[nSample]);
- tags.encoder = mpt::ToWide(mpt::CharsetLocale, MptVersion::GetOpenMPTVersionStr());
+ tags.title = mpt::ToUnicode(mpt::CharsetLocale, m_szNames[nSample]);
+ tags.encoder = mpt::ToUnicode(mpt::CharsetLocale, MptVersion::GetOpenMPTVersionStr());
file.WriteMetatags(tags);
return true;
Modified: trunk/OpenMPT/soundlib/Tagging.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Tagging.cpp 2014-10-01 13:28:43 UTC (rev 4345)
+++ trunk/OpenMPT/soundlib/Tagging.cpp 2014-10-01 13:43:56 UTC (rev 4346)
@@ -19,7 +19,7 @@
FileTags::FileTags()
//------------------
{
- encoder = mpt::ToWide(mpt::CharsetASCII, MptVersion::GetOpenMPTVersionStr());
+ encoder = mpt::ToUnicode(mpt::CharsetASCII, MptVersion::GetOpenMPTVersionStr());
}
#endif // MODPLUG_NO_FILESAVE
Modified: trunk/OpenMPT/soundlib/Tagging.h
===================================================================
--- trunk/OpenMPT/soundlib/Tagging.h 2014-10-01 13:28:43 UTC (rev 4345)
+++ trunk/OpenMPT/soundlib/Tagging.h 2014-10-01 13:43:56 UTC (rev 4346)
@@ -21,20 +21,20 @@
//=============
{
- std::wstring encoder;
+ mpt::ustring encoder;
- std::wstring title;
- std::wstring comments;
+ mpt::ustring title;
+ mpt::ustring comments;
- std::wstring bpm;
+ mpt::ustring bpm;
- std::wstring artist;
- std::wstring album;
- std::wstring trackno;
- std::wstring year;
- std::wstring url;
+ mpt::ustring artist;
+ mpt::ustring album;
+ mpt::ustring trackno;
+ mpt::ustring year;
+ mpt::ustring url;
- std::wstring genre;
+ mpt::ustring genre;
FileTags();
Modified: trunk/OpenMPT/soundlib/WAVTools.cpp
===================================================================
--- trunk/OpenMPT/soundlib/WAVTools.cpp 2014-10-01 13:28:43 UTC (rev 4345)
+++ trunk/OpenMPT/soundlib/WAVTools.cpp 2014-10-01 13:43:56 UTC (rev 4346)
@@ -504,10 +504,10 @@
// Write a single tag into a open idLIST chunk
-void WAVWriter::WriteTag(RIFFChunk::id_type id, const std::wstring &wideText)
-//---------------------------------------------------------------------------
+void WAVWriter::WriteTag(RIFFChunk::id_type id, const mpt::ustring &utext)
+//------------------------------------------------------------------------
{
- std::string text = mpt::ToCharset(mpt::CharsetWindows1252, wideText);
+ std::string text = mpt::ToCharset(mpt::CharsetWindows1252, utext);
if(!text.empty())
{
const size_t length = text.length() + 1;
Modified: trunk/OpenMPT/soundlib/WAVTools.h
===================================================================
--- trunk/OpenMPT/soundlib/WAVTools.h 2014-10-01 13:28:43 UTC (rev 4345)
+++ trunk/OpenMPT/soundlib/WAVTools.h 2014-10-01 13:43:56 UTC (rev 4346)
@@ -474,7 +474,7 @@
void Write(const void *data, size_t numBytes);
// Write a single tag into a open idLIST chunk
- void WriteTag(RIFFChunk::id_type id, const std::wstring &wideText);
+ void WriteTag(RIFFChunk::id_type id, const mpt::ustring &utext);
};
#endif // MODPLUG_NO_FILESAVE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
