Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4857] trunk/OpenMPT/mptrack
|
From: <man...@us...> - 2015-03-10 22:31:41
|
Revision: 4857
http://sourceforge.net/p/modplug/code/4857
Author: manxorist
Date: 2015-03-10 22:31:34 +0000 (Tue, 10 Mar 2015)
Log Message:
-----------
[Ref] Stream Export: mpt::ustring conversion.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Mod2wave.cpp
trunk/OpenMPT/mptrack/StreamEncoder.cpp
trunk/OpenMPT/mptrack/StreamEncoder.h
trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
trunk/OpenMPT/mptrack/StreamEncoderMP3.h
trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
trunk/OpenMPT/mptrack/StreamEncoderVorbis.h
Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mod2wave.cpp 2015-03-10 21:33:04 UTC (rev 4856)
+++ trunk/OpenMPT/mptrack/Mod2wave.cpp 2015-03-10 22:31:34 UTC (rev 4857)
@@ -373,7 +373,7 @@
{
for(int quality = 100; quality >= 0; quality -= 10)
{
- int ndx = m_CbnSampleFormat.AddString(m_Settings.GetEncoderFactory()->DescribeQuality(quality * 0.01f).c_str());
+ int ndx = m_CbnSampleFormat.AddString(mpt::ToCString(m_Settings.GetEncoderFactory()->DescribeQuality(quality * 0.01f)));
m_CbnSampleFormat.SetItemData(ndx, (Encoder::ModeQuality<<24) | (quality<<0));
if(encSettings.Mode == Encoder::ModeQuality && Util::Round<int>(encSettings.Quality*100.0f) == quality)
{
@@ -385,7 +385,7 @@
{
for(std::size_t bitrate = encTraits->bitrates.size()-1; bitrate >= 0; --bitrate)
{
- int ndx = m_CbnSampleFormat.AddString(m_Settings.GetEncoderFactory()->DescribeBitrateVBR(encTraits->bitrates[bitrate]).c_str());
+ int ndx = m_CbnSampleFormat.AddString(mpt::ToCString(m_Settings.GetEncoderFactory()->DescribeBitrateVBR(encTraits->bitrates[bitrate])));
m_CbnSampleFormat.SetItemData(ndx, (Encoder::ModeVBR<<24) | (encTraits->bitrates[bitrate]<<0));
if(encSettings.Mode == Encoder::ModeVBR && static_cast<int>(encSettings.Bitrate) == encTraits->bitrates[bitrate])
{
@@ -397,7 +397,7 @@
{
for(std::size_t bitrate = encTraits->bitrates.size()-1; bitrate >= 0; --bitrate)
{
- int ndx = m_CbnSampleFormat.AddString(m_Settings.GetEncoderFactory()->DescribeBitrateABR(encTraits->bitrates[bitrate]).c_str());
+ int ndx = m_CbnSampleFormat.AddString(mpt::ToCString(m_Settings.GetEncoderFactory()->DescribeBitrateABR(encTraits->bitrates[bitrate])));
m_CbnSampleFormat.SetItemData(ndx, (Encoder::ModeABR<<24) | (encTraits->bitrates[bitrate]<<0));
if(encSettings.Mode == Encoder::ModeABR && static_cast<int>(encSettings.Bitrate) == encTraits->bitrates[bitrate])
{
@@ -409,7 +409,7 @@
{
for(std::size_t bitrate = encTraits->bitrates.size()-1; bitrate >= 0; --bitrate)
{
- int ndx = m_CbnSampleFormat.AddString(m_Settings.GetEncoderFactory()->DescribeBitrateCBR(encTraits->bitrates[bitrate]).c_str());
+ int ndx = m_CbnSampleFormat.AddString(mpt::ToCString(m_Settings.GetEncoderFactory()->DescribeBitrateCBR(encTraits->bitrates[bitrate])));
m_CbnSampleFormat.SetItemData(ndx, (Encoder::ModeCBR<<24) | (encTraits->bitrates[bitrate]<<0));
if(encSettings.Mode == Encoder::ModeCBR && static_cast<int>(encSettings.Bitrate) == encTraits->bitrates[bitrate])
{
Modified: trunk/OpenMPT/mptrack/StreamEncoder.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoder.cpp 2015-03-10 21:33:04 UTC (rev 4856)
+++ trunk/OpenMPT/mptrack/StreamEncoder.cpp 2015-03-10 22:31:34 UTC (rev 4857)
@@ -99,28 +99,28 @@
}
-std::string EncoderFactoryBase::DescribeQuality(float quality) const
-//------------------------------------------------------------------
+mpt::ustring EncoderFactoryBase::DescribeQuality(float quality) const
+//-------------------------------------------------------------------
{
- return mpt::String::Print("VBR %1%%", static_cast<int>(quality * 100.0f));
+ return mpt::String::Print(MPT_USTRING("VBR %1%%"), static_cast<int>(quality * 100.0f));
}
-std::string EncoderFactoryBase::DescribeBitrateVBR(int bitrate) const
-//-------------------------------------------------------------------
+mpt::ustring EncoderFactoryBase::DescribeBitrateVBR(int bitrate) const
+//--------------------------------------------------------------------
{
- return mpt::String::Print("VBR %1 kbit", bitrate);
+ return mpt::String::Print(MPT_USTRING("VBR %1 kbit"), bitrate);
}
-std::string EncoderFactoryBase::DescribeBitrateABR(int bitrate) const
-//-------------------------------------------------------------------
+mpt::ustring EncoderFactoryBase::DescribeBitrateABR(int bitrate) const
+//--------------------------------------------------------------------
{
- return mpt::String::Print("ABR %1 kbit", bitrate);
+ return mpt::String::Print(MPT_USTRING("ABR %1 kbit"), bitrate);
}
-std::string EncoderFactoryBase::DescribeBitrateCBR(int bitrate) const
-//-------------------------------------------------------------------
+mpt::ustring EncoderFactoryBase::DescribeBitrateCBR(int bitrate) const
+//--------------------------------------------------------------------
{
- return mpt::String::Print("CBR %1 kbit", bitrate);
+ return mpt::String::Print(MPT_USTRING("CBR %1 kbit"), bitrate);
}
Modified: trunk/OpenMPT/mptrack/StreamEncoder.h
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoder.h 2015-03-10 21:33:04 UTC (rev 4856)
+++ trunk/OpenMPT/mptrack/StreamEncoder.h 2015-03-10 22:31:34 UTC (rev 4857)
@@ -263,10 +263,10 @@
{
return traits;
}
- virtual std::string DescribeQuality(float quality) const;
- virtual std::string DescribeBitrateVBR(int bitrate) const;
- virtual std::string DescribeBitrateABR(int bitrate) const;
- virtual std::string DescribeBitrateCBR(int bitrate) const;
+ virtual mpt::ustring DescribeQuality(float quality) const;
+ virtual mpt::ustring DescribeBitrateVBR(int bitrate) const;
+ virtual mpt::ustring DescribeBitrateABR(int bitrate) const;
+ virtual mpt::ustring DescribeBitrateCBR(int bitrate) const;
virtual bool IsAvailable() const = 0;
};
Modified: trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp 2015-03-10 21:33:04 UTC (rev 4856)
+++ trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp 2015-03-10 22:31:34 UTC (rev 4857)
@@ -1520,8 +1520,8 @@
}
-std::string MP3Encoder::DescribeQuality(float quality) const
-//----------------------------------------------------------
+mpt::ustring MP3Encoder::DescribeQuality(float quality) const
+//-----------------------------------------------------------
{
#ifdef MPT_MP3ENCODER_LAME
if(m_Type == MP3EncoderLame)
@@ -1531,23 +1531,23 @@
if(q < 0) q = 0;
if(q >= 10)
{
- return mpt::String::Print("VBR -V%1 (~%2 kbit)", "9.999", q_table[q]);
+ return mpt::String::Print(MPT_USTRING("VBR -V%1 (~%2 kbit)"), MPT_USTRING("9.999"), q_table[q]);
} else
{
- return mpt::String::Print("VBR -V%1 (~%2 kbit)", Util::Round<int>((1.0f - quality) * 10.0f), q_table[q]);
+ return mpt::String::Print(MPT_USTRING("VBR -V%1 (~%2 kbit)"), Util::Round<int>((1.0f - quality) * 10.0f), q_table[q]);
}
}
#endif // MPT_MP3ENCODER_LAME
return EncoderFactoryBase::DescribeQuality(quality);
}
-std::string MP3Encoder::DescribeBitrateABR(int bitrate) const
-//-----------------------------------------------------------
+mpt::ustring MP3Encoder::DescribeBitrateABR(int bitrate) const
+//------------------------------------------------------------
{
#ifdef MPT_MP3ENCODER_BLADE
if(m_Type == MP3EncoderBlade)
{
- return mpt::String::Print("%1 kbit", bitrate);
+ return mpt::String::Print(MPT_USTRING("%1 kbit"), bitrate);
}
#endif // MPT_MP3ENCODER_BLADE
return EncoderFactoryBase::DescribeBitrateABR(bitrate);
Modified: trunk/OpenMPT/mptrack/StreamEncoderMP3.h
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderMP3.h 2015-03-10 21:33:04 UTC (rev 4856)
+++ trunk/OpenMPT/mptrack/StreamEncoderMP3.h 2015-03-10 22:31:34 UTC (rev 4857)
@@ -61,8 +61,8 @@
public:
IAudioStreamEncoder *ConstructStreamEncoder(std::ostream &file) const;
- std::string DescribeQuality(float quality) const;
- std::string DescribeBitrateABR(int bitrate) const;
+ mpt::ustring DescribeQuality(float quality) const;
+ mpt::ustring DescribeBitrateABR(int bitrate) const;
bool IsAvailable() const;
public:
Modified: trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp 2015-03-10 21:33:04 UTC (rev 4856)
+++ trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp 2015-03-10 22:31:34 UTC (rev 4857)
@@ -437,12 +437,12 @@
}
-std::string VorbisEncoder::DescribeQuality(float quality) const
-//-------------------------------------------------------------
+mpt::ustring VorbisEncoder::DescribeQuality(float quality) const
+//--------------------------------------------------------------
{
static const int q_table[11] = { 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 500 }; // http://wiki.hydrogenaud.io/index.php?title=Recommended_Ogg_Vorbis
int q = Clamp(Util::Round<int>(quality * 10.0f), 0, 10);
- return mpt::String::Print("Q%1 (~%2 kbit)", mpt::fmt::f("%3.1f", quality * 10.0f), q_table[q]);
+ return mpt::String::Print(MPT_USTRING("Q%1 (~%2 kbit)"), mpt::ufmt::f("%3.1f", quality * 10.0f), q_table[q]);
}
Modified: trunk/OpenMPT/mptrack/StreamEncoderVorbis.h
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderVorbis.h 2015-03-10 21:33:04 UTC (rev 4856)
+++ trunk/OpenMPT/mptrack/StreamEncoderVorbis.h 2015-03-10 22:31:34 UTC (rev 4857)
@@ -30,7 +30,7 @@
public:
IAudioStreamEncoder *ConstructStreamEncoder(std::ostream &file) const;
- std::string DescribeQuality(float quality) const;
+ mpt::ustring DescribeQuality(float quality) const;
bool IsAvailable() const;
public:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
