Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4446] trunk/OpenMPT
|
From: <man...@us...> - 2014-10-19 15:19:48
|
Revision: 4446
http://sourceforge.net/p/modplug/code/4446
Author: manxorist
Date: 2014-10-19 15:19:34 +0000 (Sun, 19 Oct 2014)
Log Message:
-----------
[Ref] Cleanup ASSERT(). Provide properly namespace-prefixed MPT_ASSERT, MPT_ASSERT_MSG, MPT_ASSERT_ALWAYS, MPT_ASSERT_ALWAYS_MSG macros that do not depend on or possibly conflict with platform or framework provided ASSERT macros. For MFC builds, this stays as a synonym for the MFC-provided ASSERT macro, thus this commit does not change any functionality at all.
[Ref] Replace all occurences of ASSERT with MPT_ASSERT in code used by libopenmpt (i.e. common/ and soundlib/ ).
[Ref] sounddev: Replace ASSERT with MPT_ASSERT.
Modified Paths:
--------------
trunk/OpenMPT/common/AudioCriticalSection.h
trunk/OpenMPT/common/StringFixer.h
trunk/OpenMPT/common/misc_util.cpp
trunk/OpenMPT/common/misc_util.h
trunk/OpenMPT/common/mptIO.h
trunk/OpenMPT/common/mptString.cpp
trunk/OpenMPT/common/serialization_utils.h
trunk/OpenMPT/common/thread.h
trunk/OpenMPT/common/typedefs.h
trunk/OpenMPT/mptrack/Globals.cpp
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp
trunk/OpenMPT/sounddev/SoundDeviceThread.cpp
trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp
trunk/OpenMPT/sounddsp/EQ.cpp
trunk/OpenMPT/soundlib/AudioReadTarget.h
trunk/OpenMPT/soundlib/Fastmix.cpp
trunk/OpenMPT/soundlib/FileReader.h
trunk/OpenMPT/soundlib/ITCompression.cpp
trunk/OpenMPT/soundlib/Load_amf.cpp
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/Load_mod.cpp
trunk/OpenMPT/soundlib/Load_okt.cpp
trunk/OpenMPT/soundlib/Load_psm.cpp
trunk/OpenMPT/soundlib/Load_s3m.cpp
trunk/OpenMPT/soundlib/Load_umx.cpp
trunk/OpenMPT/soundlib/Load_wav.cpp
trunk/OpenMPT/soundlib/ModSequence.h
trunk/OpenMPT/soundlib/RowVisitor.cpp
trunk/OpenMPT/soundlib/SampleFormatConverters.h
trunk/OpenMPT/soundlib/SampleFormats.cpp
trunk/OpenMPT/soundlib/SampleIO.cpp
trunk/OpenMPT/soundlib/Snd_flt.cpp
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
trunk/OpenMPT/soundlib/Sndmix.cpp
trunk/OpenMPT/soundlib/Tables.cpp
trunk/OpenMPT/soundlib/WAVTools.cpp
trunk/OpenMPT/soundlib/load_j2b.cpp
trunk/OpenMPT/soundlib/tuning.cpp
trunk/OpenMPT/soundlib/tuningbase.h
trunk/OpenMPT/test/test.cpp
Modified: trunk/OpenMPT/common/AudioCriticalSection.h
===================================================================
--- trunk/OpenMPT/common/AudioCriticalSection.h 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/common/AudioCriticalSection.h 2014-10-19 15:19:34 UTC (rev 4446)
@@ -66,7 +66,7 @@
static void AssertUnlocked()
{
// asserts that the critical section is currently not hold by THIS thread
- ALWAYS_ASSERT(!IsLocked());
+ MPT_ASSERT_ALWAYS(!IsLocked());
}
};
Modified: trunk/OpenMPT/common/StringFixer.h
===================================================================
--- trunk/OpenMPT/common/StringFixer.h 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/common/StringFixer.h 2014-10-19 15:19:34 UTC (rev 4446)
@@ -34,7 +34,7 @@
inline void SetNullTerminator(char *buffer, size_t size)
//------------------------------------------------------
{
- ASSERT(size > 0);
+ MPT_ASSERT(size > 0);
buffer[size - 1] = 0;
}
@@ -49,7 +49,7 @@
inline void SetNullTerminator(wchar_t *buffer, size_t size)
//---------------------------------------------------------
{
- ASSERT(size > 0);
+ MPT_ASSERT(size > 0);
buffer[size - 1] = 0;
}
@@ -271,7 +271,7 @@
void Write(char *destBuffer, const size_t destSize, const char *srcBuffer, const size_t srcSize)
//----------------------------------------------------------------------------------------------
{
- ASSERT(destSize > 0);
+ MPT_ASSERT(destSize > 0);
const size_t maxSize = MIN(destSize, srcSize);
char *dst = destBuffer;
@@ -314,7 +314,7 @@
void Write(std::vector<char> &destBuffer, const char *srcBuffer, const size_t srcSize)
//------------------------------------------------------------------------------------
{
- ASSERT(destBuffer.size() > 0);
+ MPT_ASSERT(destBuffer.size() > 0);
Write<mode>(&destBuffer[0], destBuffer.size(), srcBuffer, srcSize);
}
@@ -345,7 +345,7 @@
void Write(char *destBuffer, const size_t destSize, const std::string &src)
//-------------------------------------------------------------------------
{
- ASSERT(destSize > 0);
+ MPT_ASSERT(destSize > 0);
Write<mode>(destBuffer, destSize, src.c_str(), src.length());
}
@@ -353,7 +353,7 @@
void Write(std::vector<char> &destBuffer, const std::string &src)
//---------------------------------------------------------------
{
- ASSERT(destBuffer.size() > 0);
+ MPT_ASSERT(destBuffer.size() > 0);
Write<mode>(destBuffer, src.c_str(), src.length());
}
Modified: trunk/OpenMPT/common/misc_util.cpp
===================================================================
--- trunk/OpenMPT/common/misc_util.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/common/misc_util.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -179,7 +179,7 @@
if(timeEndPeriod(m_CurrentPeriod) != MMSYSERR_NOERROR)
{
// should not happen
- ASSERT(false);
+ MPT_ASSERT(false);
}
m_CurrentPeriod = 0;
}
Modified: trunk/OpenMPT/common/misc_util.h
===================================================================
--- trunk/OpenMPT/common/misc_util.h 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/common/misc_util.h 2014-10-19 15:19:34 UTC (rev 4446)
@@ -392,7 +392,7 @@
{
static_assert(std::numeric_limits<T>::is_integer == true, "Type is a not an integer");
const double valRounded = Round(val);
- ASSERT(valRounded >= (std::numeric_limits<T>::min)() && valRounded <= (std::numeric_limits<T>::max)());
+ MPT_ASSERT(valRounded >= (std::numeric_limits<T>::min)() && valRounded <= (std::numeric_limits<T>::max)());
const T intval = static_cast<T>(valRounded);
return intval;
}
@@ -401,7 +401,7 @@
{
static_assert(std::numeric_limits<T>::is_integer == true, "Type is a not an integer");
const float valRounded = Round(val);
- ASSERT(valRounded >= (std::numeric_limits<T>::min)() && valRounded <= (std::numeric_limits<T>::max)());
+ MPT_ASSERT(valRounded >= (std::numeric_limits<T>::min)() && valRounded <= (std::numeric_limits<T>::max)());
const T intval = static_cast<T>(valRounded);
return intval;
}
Modified: trunk/OpenMPT/common/mptIO.h
===================================================================
--- trunk/OpenMPT/common/mptIO.h 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/common/mptIO.h 2014-10-19 15:19:34 UTC (rev 4446)
@@ -289,9 +289,9 @@
template <typename Tfile>
inline bool WriteAdaptiveInt16LE(Tfile & f, const uint16 & v, std::size_t minSize = 0, std::size_t maxSize = 0)
{
- ASSERT(minSize == 0 || minSize == 1 || minSize == 2);
- ASSERT(maxSize == 0 || maxSize == 1 || maxSize == 2);
- ASSERT(maxSize == 0 || maxSize >= minSize);
+ MPT_ASSERT(minSize == 0 || minSize == 1 || minSize == 2);
+ MPT_ASSERT(maxSize == 0 || maxSize == 1 || maxSize == 2);
+ MPT_ASSERT(maxSize == 0 || maxSize >= minSize);
if(v < 0x80 && minSize <= 1 && (1 <= maxSize || maxSize == 0))
{
return IO::WriteIntLE<uint8>(f, static_cast<uint8>(v << 1) | 0x00);
@@ -300,7 +300,7 @@
return IO::WriteIntLE<uint16>(f, static_cast<uint16>(v << 1) | 0x01);
} else
{
- ASSERT(false);
+ MPT_ASSERT(false);
return false;
}
}
@@ -308,9 +308,9 @@
template <typename Tfile>
inline bool WriteAdaptiveInt32LE(Tfile & f, const uint32 & v, std::size_t minSize = 0, std::size_t maxSize = 0)
{
- ASSERT(minSize == 0 || minSize == 1 || minSize == 2 || minSize == 3 || minSize == 4);
- ASSERT(maxSize == 0 || maxSize == 1 || maxSize == 2 || maxSize == 3 || maxSize == 4);
- ASSERT(maxSize == 0 || maxSize >= minSize);
+ MPT_ASSERT(minSize == 0 || minSize == 1 || minSize == 2 || minSize == 3 || minSize == 4);
+ MPT_ASSERT(maxSize == 0 || maxSize == 1 || maxSize == 2 || maxSize == 3 || maxSize == 4);
+ MPT_ASSERT(maxSize == 0 || maxSize >= minSize);
if(v < 0x40 && minSize <= 1 && (1 <= maxSize || maxSize == 0))
{
return IO::WriteIntLE<uint8>(f, static_cast<uint8>(v << 2) | 0x00);
@@ -330,7 +330,7 @@
return IO::WriteIntLE<uint32>(f, static_cast<uint32>(v << 2) | 0x03);
} else
{
- ASSERT(false);
+ MPT_ASSERT(false);
return false;
}
}
@@ -338,9 +338,9 @@
template <typename Tfile>
inline bool WriteAdaptiveInt64LE(Tfile & f, const uint64 & v, std::size_t minSize = 0, std::size_t maxSize = 0)
{
- ASSERT(minSize == 0 || minSize == 1 || minSize == 2 || minSize == 4 || minSize == 8);
- ASSERT(maxSize == 0 || maxSize == 1 || maxSize == 2 || maxSize == 4 || maxSize == 8);
- ASSERT(maxSize == 0 || maxSize >= minSize);
+ MPT_ASSERT(minSize == 0 || minSize == 1 || minSize == 2 || minSize == 4 || minSize == 8);
+ MPT_ASSERT(maxSize == 0 || maxSize == 1 || maxSize == 2 || maxSize == 4 || maxSize == 8);
+ MPT_ASSERT(maxSize == 0 || maxSize >= minSize);
if(v < 0x40 && minSize <= 1 && (1 <= maxSize || maxSize == 0))
{
return IO::WriteIntLE<uint8>(f, static_cast<uint8>(v << 2) | 0x00);
@@ -355,7 +355,7 @@
return IO::WriteIntLE<uint64>(f, static_cast<uint64>(v << 2) | 0x03);
} else
{
- ASSERT(false);
+ MPT_ASSERT(false);
return false;
}
}
Modified: trunk/OpenMPT/common/mptString.cpp
===================================================================
--- trunk/OpenMPT/common/mptString.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/common/mptString.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -441,7 +441,7 @@
{
// nothing
}
- ASSERT(false);
+ MPT_ASSERT(false);
return String::FromAscii(str, replacement); // fallback
}
@@ -472,7 +472,7 @@
{
// nothing
}
- ASSERT(false);
+ MPT_ASSERT(false);
return String::ToAscii(str, replacement); // fallback
}
@@ -1305,7 +1305,7 @@
template<typename Tchar>
inline Format ParseFormatStringFloat(const Tchar * str)
{
- ASSERT(str);
+ MPT_ASSERT(str);
FormatFlags f = FormatFlags();
std::size_t width = 0;
int precision = -1;
Modified: trunk/OpenMPT/common/serialization_utils.h
===================================================================
--- trunk/OpenMPT/common/serialization_utils.h 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/common/serialization_utils.h 2014-10-19 15:19:34 UTC (rev 4446)
@@ -465,7 +465,7 @@
inline SsbRead::ReadIterator SsbRead::GetReadBegin()
//------------------------------------------
{
- ASSERT(GetFlag(RwfRMapHasId) && (GetFlag(RwfRMapHasStartpos) || GetFlag(RwfRMapHasSize) || m_nFixedEntrySize > 0));
+ MPT_ASSERT(GetFlag(RwfRMapHasId) && (GetFlag(RwfRMapHasStartpos) || GetFlag(RwfRMapHasSize) || m_nFixedEntrySize > 0));
if (GetFlag(RwfRMapCached) == false)
CacheMap();
return mapData.begin();
Modified: trunk/OpenMPT/common/thread.h
===================================================================
--- trunk/OpenMPT/common/thread.h 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/common/thread.h 2014-10-19 15:19:34 UTC (rev 4446)
@@ -275,7 +275,7 @@
~thread()
{
- ASSERT(!joinable());
+ MPT_ASSERT(!joinable());
}
};
Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/common/typedefs.h 2014-10-19 15:19:34 UTC (rev 4446)
@@ -195,72 +195,70 @@
#if !defined(ASSERT)
#error "MFC is expected to #define ASSERT"
#endif // !defined(ASERRT)
-#define MPT_ASSERT_IS_DEFINED
+#define MPT_FRAMEWORK_ASSERT_IS_DEFINED
#if defined(_DEBUG)
- #define MPT_ASSERT_IS_ACTIVE 1
+ #define MPT_FRAMEWORK_ASSERT_IS_ACTIVE 1
#else // !_DEBUG
- #define MPT_ASSERT_IS_ACTIVE 0
+ #define MPT_FRAMEWORK_ASSERT_IS_ACTIVE 0
#endif // _DEBUG
+// let MFC handle our asserts
+#define MPT_ASSERT_USE_FRAMEWORK 1
+
#else // !_MFC_VER
#if defined(ASSERT)
-#error "ASSERT(expr) is expected to NOT be defined by any other header"
+#define MPT_FRAMEWORK_ASSERT_IS_DEFINED
+#if defined(_DEBUG)
+ #define MPT_FRAMEWORK_ASSERT_IS_ACTIVE 1
+#else // !_DEBUG
+ #define MPT_FRAMEWORK_ASSERT_IS_ACTIVE 0
+#endif // _DEBUG
#endif // !defined(ASERRT)
+// handle assert in our own way without relying on some platform-/framework-specific assert implementation
+#define MPT_ASSERT_USE_FRAMEWORK 0
+
#endif // _MFC_VER
-#if defined(MPT_ASSERT_IS_DEFINED)
+#if defined(MPT_FRAMEWORK_ASSERT_IS_DEFINED) && (MPT_ASSERT_USE_FRAMEWORK == 1)
-//#define ASSERT // already defined
-#define ASSERT_WARN_MESSAGE(expr,msg) ASSERT(expr)
+#define MPT_ASSERT(expr) ASSERT((expr))
+#define MPT_ASSERT_MSG(expr, msg) ASSERT((expr) && (msg))
+#if (MPT_FRAMEWORK_ASSERT_IS_ACTIVE == 1)
+#define MPT_ASSERT_ALWAYS(expr) ASSERT((expr))
+#define MPT_ASSERT_ALWAYS_MSG(expr, msg) ASSERT((expr) && (msg))
+#else
+#define MPT_ASSERT_ALWAYS(expr) do { if(!(expr)) { AssertHandler(__FILE__, __LINE__, __FUNCTION__, #expr); } } while(0)
+#define MPT_ASSERT_ALWAYS_MSG(expr, msg) do { if(!(expr)) { AssertHandler(__FILE__, __LINE__, __FUNCTION__, #expr, msg); } } while(0)
+#ifndef MPT_ASSERT_HANDLER_NEEDED
+#define MPT_ASSERT_HANDLER_NEEDED
+#endif
+#endif
#elif defined(NO_ASSERTS)
-#define MPT_ASSERT_IS_DEFINED
-#define MPT_ASSERT_IS_ACTIVE 0
-#define ASSERT(expr) do { } while(0)
-#define ASSERT_WARN_MESSAGE(expr,msg) do { } while(0)
-
-#else // !NO_ASSERTS
-
-#define MPT_ASSERT_IS_DEFINED
-#define MPT_ASSERT_IS_ACTIVE 1
-#define ASSERT(expr) do { if(!(expr)) { AssertHandler(__FILE__, __LINE__, __FUNCTION__, #expr); } } while(0)
-#define ASSERT_WARN_MESSAGE(expr,msg) do { if(!(expr)) { AssertHandler(__FILE__, __LINE__, __FUNCTION__, #expr, msg); } } while(0)
+#define MPT_ASSERT(expr) do { } while(0)
+#define MPT_ASSERT_MSG(expr, msg) do { } while(0)
+#define MPT_ASSERT_ALWAYS(expr) do { if(!(expr)) { AssertHandler(__FILE__, __LINE__, __FUNCTION__, #expr); } } while(0)
+#define MPT_ASSERT_ALWAYS_MSG(expr, msg) do { if(!(expr)) { AssertHandler(__FILE__, __LINE__, __FUNCTION__, #expr, msg); } } while(0)
#ifndef MPT_ASSERT_HANDLER_NEEDED
#define MPT_ASSERT_HANDLER_NEEDED
#endif
-#endif // NO_ASSERTS
+#else // !NO_ASSERTS
-// error checking
-#if !defined(MPT_ASSERT_IS_DEFINED)
-#error "ASSERT(expr) has to be defined"
-#endif // !MPT_ASSERT_IS_DEFINED
-#if MPT_ASSERT_IS_ACTIVE && defined(NO_ASSERTS)
-#error "ASSERT is active but NO_ASSERT is defined"
-#elif !MPT_ASSERT_IS_ACTIVE && !defined(NO_ASSERTS)
-#error "NO_ASSERT is not defined but ASSERTs are not active"
-#endif
-
-
-#if (MPT_ASSERT_IS_ACTIVE == 1)
-
-#define ALWAYS_ASSERT(expr) ASSERT(expr)
-#define ALWAYS_ASSERT_WARN_MESSAGE(expr,msg) ASSERT_WARN_MESSAGE(expr,msg)
-
-#else // (MPT_ASSERT_IS_ACTIVE != 1)
-
-#define ALWAYS_ASSERT(expr) do { if(!(expr)) { AssertHandler(__FILE__, __LINE__, __FUNCTION__, #expr); } } while(0)
-#define ALWAYS_ASSERT_WARN_MESSAGE(expr,msg) do { if(!(expr)) { AssertHandler(__FILE__, __LINE__, __FUNCTION__, #expr, msg); } } while(0)
+#define MPT_ASSERT(expr) do { if(!(expr)) { AssertHandler(__FILE__, __LINE__, __FUNCTION__, #expr); } } while(0)
+#define MPT_ASSERT_MSG(expr, msg) do { if(!(expr)) { AssertHandler(__FILE__, __LINE__, __FUNCTION__, #expr, msg); } } while(0)
+#define MPT_ASSERT_ALWAYS(expr) do { if(!(expr)) { AssertHandler(__FILE__, __LINE__, __FUNCTION__, #expr); } } while(0)
+#define MPT_ASSERT_ALWAYS_MSG(expr, msg) do { if(!(expr)) { AssertHandler(__FILE__, __LINE__, __FUNCTION__, #expr, msg); } } while(0)
#ifndef MPT_ASSERT_HANDLER_NEEDED
#define MPT_ASSERT_HANDLER_NEEDED
#endif
-#endif // MPT_ASSERT_IS_ACTIVE
+#endif // NO_ASSERTS
#if defined(MPT_ASSERT_HANDLER_NEEDED)
Modified: trunk/OpenMPT/mptrack/Globals.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Globals.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/mptrack/Globals.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -357,7 +357,7 @@
pDlg = m_Pages[nIndex];
} else //Ctrl window is not created yet - creating one.
{
- ALWAYS_ASSERT(GetDocument() != nullptr);
+ MPT_ASSERT_ALWAYS(GetDocument() != nullptr);
switch(nID)
{
//rewbs.graph
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -676,7 +676,7 @@
{
MPT_TRACE();
CriticalSection cs;
- ALWAYS_ASSERT(m_pSndFile != nullptr);
+ MPT_ASSERT_ALWAYS(m_pSndFile != nullptr);
m_AudioThreadId = GetCurrentThreadId();
mpt::log::Trace::SetThreadId(mpt::log::Trace::ThreadKindAudio, m_AudioThreadId);
callback.FillAudioBuffer();
@@ -701,7 +701,7 @@
, dither(dither_)
, buffer(buffer_)
{
- ALWAYS_ASSERT(sampleFormat.IsValid());
+ MPT_ASSERT_ALWAYS(sampleFormat.IsValid());
}
virtual void DataCallback(int *MixSoundBuffer, std::size_t channels, std::size_t countChunk)
{
Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -247,7 +247,7 @@
{
MPT_TRACE();
- ASSERT(!IsDriverOpen());
+ MPT_ASSERT(!IsDriverOpen());
InitMembers();
@@ -356,7 +356,7 @@
}
} else
{ // should not happen
- ASSERT(false);
+ MPT_ASSERT(false);
}
m_BufferInfo.resize(m_Settings.Channels);
@@ -370,7 +370,7 @@
m_Callbacks.sampleRateDidChange = CallbackSampleRateDidChange;
m_Callbacks.asioMessage = CallbackAsioMessage;
m_Callbacks.bufferSwitchTimeInfo = CallbackBufferSwitchTimeInfo;
- ALWAYS_ASSERT(g_CallbacksInstance == nullptr);
+ MPT_ASSERT_ALWAYS(g_CallbacksInstance == nullptr);
g_CallbacksInstance = this;
Log(mpt::String::Print("ASIO: createBuffers(numChannels=%1, bufferSize=%2)", m_Settings.Channels, m_nAsioBufferLen));
asioCall(createBuffers(&m_BufferInfo[0], m_Settings.Channels, m_nAsioBufferLen, &m_Callbacks));
@@ -383,7 +383,7 @@
m_ChannelInfo[channel].isInput = ASIOFalse;
m_ChannelInfo[channel].channel = m_Settings.ChannelMapping.ToDevice(channel);
asioCall(getChannelInfo(&m_ChannelInfo[channel]));
- ASSERT(m_ChannelInfo[channel].isActive);
+ MPT_ASSERT(m_ChannelInfo[channel].isActive);
mpt::String::SetNullTerminator(m_ChannelInfo[channel].name);
Log(mpt::String::Print("ASIO: getChannelInfo(isInput=%1 channel=%2) => isActive=%3 channelGroup=%4 type=%5 name='%6'"
, ASIOFalse
@@ -519,19 +519,19 @@
{
if(CriticalSection::IsLocked())
{
- ASSERT_WARN_MESSAGE(false, "AudioCriticalSection locked while stopping ASIO");
+ MPT_ASSERT_MSG(false, "AudioCriticalSection locked while stopping ASIO");
} else
{
- ASSERT_WARN_MESSAGE(false, "waiting for asio failed in Stop()");
+ MPT_ASSERT_MSG(false, "waiting for asio failed in Stop()");
}
} else
{
if(CriticalSection::IsLocked())
{
- ASSERT_WARN_MESSAGE(false, "AudioCriticalSection locked while starting ASIO");
+ MPT_ASSERT_MSG(false, "AudioCriticalSection locked while starting ASIO");
} else
{
- ASSERT_WARN_MESSAGE(false, "waiting for asio failed in Start()");
+ MPT_ASSERT_MSG(false, "waiting for asio failed in Start()");
}
}
break;
@@ -545,7 +545,7 @@
//-------------------------------
{
MPT_TRACE();
- ALWAYS_ASSERT_WARN_MESSAGE(!CriticalSection::IsLocked(), "AudioCriticalSection locked while starting ASIO");
+ MPT_ASSERT_ALWAYS_MSG(!CriticalSection::IsLocked(), "AudioCriticalSection locked while starting ASIO");
if(m_Settings.KeepDeviceRunning)
{
@@ -589,7 +589,7 @@
//--------------------------------------------
{
MPT_TRACE();
- ALWAYS_ASSERT_WARN_MESSAGE(!CriticalSection::IsLocked(), "AudioCriticalSection locked while stopping ASIO");
+ MPT_ASSERT_ALWAYS_MSG(!CriticalSection::IsLocked(), "AudioCriticalSection locked while stopping ASIO");
if(m_Settings.KeepDeviceRunning && !force)
{
@@ -648,7 +648,7 @@
}
if(g_CallbacksInstance)
{
- ALWAYS_ASSERT(g_CallbacksInstance == this);
+ MPT_ASSERT_ALWAYS(g_CallbacksInstance == this);
g_CallbacksInstance = nullptr;
}
MemsetZero(m_Callbacks);
@@ -869,7 +869,7 @@
std::memset(&m_SampleBufferInt32[0], 0, countChunk * channels * sizeof(int32));
} else
{
- ASSERT(false);
+ MPT_ASSERT(false);
}
} else
{
@@ -888,7 +888,7 @@
SourceAudioRead(&m_SampleBufferInt32[0], countChunk);
} else
{
- ASSERT(false);
+ MPT_ASSERT(false);
}
}
for(int channel = 0; channel < channels; ++channel)
@@ -913,7 +913,7 @@
CopyInterleavedToChannel<SC::Convert<double, float> >(reinterpret_cast<double*>(dst), srcFloat, channels, countChunk, channel);
break;
default:
- ASSERT(false);
+ MPT_ASSERT(false);
break;
}
} else if(m_Settings.sampleFormat == SampleFormatInt16)
@@ -926,7 +926,7 @@
CopyInterleavedToChannel<SC::Convert<int16, int16> >(reinterpret_cast<int16*>(dst), srcInt16, channels, countChunk, channel);
break;
default:
- ASSERT(false);
+ MPT_ASSERT(false);
break;
}
} else if(m_Settings.sampleFormat == SampleFormatInt24)
@@ -939,7 +939,7 @@
CopyInterleavedToChannel<SC::Convert<int24, int24> >(reinterpret_cast<int24*>(dst), srcInt24, channels, countChunk, channel);
break;
default:
- ASSERT(false);
+ MPT_ASSERT(false);
break;
}
} else if(m_Settings.sampleFormat == SampleFormatInt32)
@@ -984,12 +984,12 @@
CopyInterleavedToChannel<SC::ConvertShift<int32, int32, 8> >(reinterpret_cast<int32*>(dst), srcInt32, channels, countChunk, channel);
break;
default:
- ASSERT(false);
+ MPT_ASSERT(false);
break;
}
} else
{
- ASSERT(false);
+ MPT_ASSERT(false);
}
if(IsSampleTypeBigEndian(m_ChannelInfo[channel].type))
{
@@ -1090,7 +1090,7 @@
//-----------------------------------------------------------------------------------------------------------
{
MPT_TRACE();
- ASSERT(directProcess); // !directProcess is not handled correctly in OpenMPT, would require a separate thread and potentially additional buffering
+ MPT_ASSERT(directProcess); // !directProcess is not handled correctly in OpenMPT, would require a separate thread and potentially additional buffering
if(!directProcess)
{
m_UsedFeatures.set(AsioFeatureNoDirectProcess);
@@ -1306,7 +1306,7 @@
//------------------------------------------------------------------------------------------
{
MPT_TRACE();
- ALWAYS_ASSERT(g_CallbacksInstance);
+ MPT_ASSERT_ALWAYS(g_CallbacksInstance);
if(!g_CallbacksInstance) return 0;
return g_CallbacksInstance->AsioMessage(selector, value, message, opt);
}
@@ -1316,7 +1316,7 @@
//-----------------------------------------------------------------
{
MPT_TRACE();
- ALWAYS_ASSERT(g_CallbacksInstance);
+ MPT_ASSERT_ALWAYS(g_CallbacksInstance);
if(!g_CallbacksInstance) return;
g_CallbacksInstance->SampleRateDidChange(sRate);
}
@@ -1326,7 +1326,7 @@
//------------------------------------------------------------------------------------
{
MPT_TRACE();
- ALWAYS_ASSERT(g_CallbacksInstance);
+ MPT_ASSERT_ALWAYS(g_CallbacksInstance);
if(!g_CallbacksInstance) return;
g_CallbacksInstance->BufferSwitch(doubleBufferIndex, directProcess);
}
@@ -1336,7 +1336,7 @@
//-------------------------------------------------------------------------------------------------------------------
{
MPT_TRACE();
- ALWAYS_ASSERT(g_CallbacksInstance);
+ MPT_ASSERT_ALWAYS(g_CallbacksInstance);
if(!g_CallbacksInstance) return params;
return g_CallbacksInstance->BufferSwitchTimeInfo(params, doubleBufferIndex, directProcess);
}
Modified: trunk/OpenMPT/sounddev/SoundDeviceThread.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceThread.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/sounddev/SoundDeviceThread.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -352,7 +352,7 @@
{
if(InterlockedExchangeAdd(&m_AudioThreadActive, 0))
{
- ALWAYS_ASSERT(false);
+ MPT_ASSERT_ALWAYS(false);
return;
}
ResetEvent(m_hAudioThreadGoneIdle);
@@ -366,7 +366,7 @@
{
if(!InterlockedExchangeAdd(&m_AudioThreadActive, 0))
{
- ALWAYS_ASSERT(false);
+ MPT_ASSERT_ALWAYS(false);
return;
}
InterlockedExchange(&m_AudioThreadActive, 0);
Modified: trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -204,7 +204,7 @@
waveOutUnprepareHeader(m_hWaveOut, &m_WaveBuffers[m_nPreparedHeaders], sizeof(WAVEHDR));
}
MMRESULT err = waveOutClose(m_hWaveOut);
- ALWAYS_ASSERT(err == MMSYSERR_NOERROR);
+ MPT_ASSERT_ALWAYS(err == MMSYSERR_NOERROR);
m_hWaveOut = NULL;
}
if(m_ThreadWakeupEvent)
Modified: trunk/OpenMPT/sounddsp/EQ.cpp
===================================================================
--- trunk/OpenMPT/sounddsp/EQ.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/sounddsp/EQ.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -393,8 +393,8 @@
//--------
{
#if defined(ENABLE_SSE) || defined(ENABLE_X86_AMD)
- ALWAYS_ASSERT(((uintptr_t)&(gEQ[0])) % 4 == 0);
- ALWAYS_ASSERT(((uintptr_t)&(gEQ[1])) % 4 == 0);
+ MPT_ASSERT_ALWAYS(((uintptr_t)&(gEQ[0])) % 4 == 0);
+ MPT_ASSERT_ALWAYS(((uintptr_t)&(gEQ[1])) % 4 == 0);
#endif // ENABLE_SSE || ENABLE_X86_AMD
memcpy(gEQ, gEQDefaults, sizeof(gEQ));
}
Modified: trunk/OpenMPT/soundlib/AudioReadTarget.h
===================================================================
--- trunk/OpenMPT/soundlib/AudioReadTarget.h 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/AudioReadTarget.h 2014-10-19 15:19:34 UTC (rev 4446)
@@ -36,7 +36,7 @@
, outputBuffer(buffer)
, outputBuffers(buffers)
{
- ASSERT(SampleFormat(SampleFormatTraits<Tsample>::sampleFormat).IsValid());
+ MPT_ASSERT(SampleFormat(SampleFormatTraits<Tsample>::sampleFormat).IsValid());
}
virtual ~AudioReadTargetBuffer() { }
std::size_t GetRenderedCount() const { return countRendered; }
Modified: trunk/OpenMPT/soundlib/Fastmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Fastmix.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Fastmix.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -442,7 +442,7 @@
uint32 targetpos = chn.nPos + (BufferLengthToSamples(nSmpCount, chn) >> 16);
MixFuncTable::Functions[functionNdx | (chn.nRampLength ? MixFuncTable::ndxRamp : 0)](chn, m_Resampler, pbuffer, nSmpCount);
- ASSERT(chn.nPos == targetpos);
+ MPT_ASSERT(chn.nPos == targetpos);
chn.nROfs += *(pbufmax-2);
chn.nLOfs += *(pbufmax-1);
Modified: trunk/OpenMPT/soundlib/FileReader.h
===================================================================
--- trunk/OpenMPT/soundlib/FileReader.h 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/FileReader.h 2014-10-19 15:19:34 UTC (rev 4446)
@@ -286,7 +286,7 @@
T ReadTruncatedIntLE(off_t size)
{
static_assert(std::numeric_limits<T>::is_integer == true, "Target type is a not an integer");
- ASSERT(sizeof(T) >= size);
+ MPT_ASSERT(sizeof(T) >= size);
if(size == 0)
{
return 0;
Modified: trunk/OpenMPT/soundlib/ITCompression.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ITCompression.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/ITCompression.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -153,7 +153,7 @@
if(width <= 6)
{
// Mode A: 1 to 6 bits
- ASSERT(width);
+ MPT_ASSERT(width);
WriteBits(width, (1 << (width - 1)));
WriteBits(Properties::fetchA, ConvertWidth(width, bwt[i]));
} else if(width < defWidth)
@@ -164,7 +164,7 @@
} else
{
// Mode C: 9 / 17 bits
- ASSERT((bwt[i] - 1) >= 0);
+ MPT_ASSERT((bwt[i] - 1) >= 0);
WriteBits(width, (1 << (width - 1)) + bwt[i] - 1);
}
@@ -183,7 +183,7 @@
int ITCompression::GetWidthChangeSize(int w, bool is16)
//-----------------------------------------------------
{
- ASSERT(w > 0 && static_cast<unsigned int>(w) <= CountOf(ITWidthChangeSize));
+ MPT_ASSERT(w > 0 && static_cast<unsigned int>(w) <= CountOf(ITWidthChangeSize));
int wcs = ITWidthChangeSize[w - 1];
if(w <= 6 && is16)
wcs++;
@@ -202,7 +202,7 @@
return;
}
- ASSERT(width >= 0 && static_cast<unsigned int>(width) < CountOf(Properties::lowerTab));
+ MPT_ASSERT(width >= 0 && static_cast<unsigned int>(width) < CountOf(Properties::lowerTab));
SmpLength i = offset;
SmpLength end = offset + length;
@@ -265,7 +265,7 @@
{
curWidth--;
newWidth--;
- ASSERT(newWidth != curWidth);
+ MPT_ASSERT(newWidth != curWidth);
if(newWidth > curWidth)
newWidth--;
return newWidth;
@@ -304,7 +304,7 @@
} else
{
// How could this happen, anyway?
- ASSERT(false);
+ MPT_ASSERT(false);
}
}
@@ -390,7 +390,7 @@
if(width >= curWidth)
width++;
- ASSERT(curWidth != width);
+ MPT_ASSERT(curWidth != width);
curWidth = width;
}
Modified: trunk/OpenMPT/soundlib/Load_amf.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_amf.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Load_amf.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -423,7 +423,7 @@
}
}
// To check: Was the channel table introduced in revision 1.0 or 0.9? I only have 0.8 files, in which it is missing...
- ASSERT(fileHeader.version != 9);
+ MPT_ASSERT(fileHeader.version != 9);
// Get Tempo/Speed
if(fileHeader.version >= 13)
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -799,7 +799,7 @@
{
chnMask.resize(ch + 1, 0);
lastValue.resize(ch + 1, ModCommand::Empty());
- ASSERT(chnMask.size() <= GetNumChannels());
+ MPT_ASSERT(chnMask.size() <= GetNumChannels());
}
if(b & IT_bitmask_patternChanEnabled_c) // 0x80
@@ -1619,7 +1619,7 @@
const uint32 MPTStartPos = (uint32)fout.tellp();
// catch standard library truncating files
- ALWAYS_ASSERT(MPTStartPos > 0);
+ MPT_ASSERT_ALWAYS(MPTStartPos > 0);
srlztn::SsbWrite ssb(fout);
ssb.BeginWrite("mptm", MptVersion::num);
@@ -1984,7 +1984,7 @@
{ \
const uint32 code = MAGIC4BE(c1, c2, c3, c4); \
mpt::IO::WriteIntLE<uint32>(f, code); \
- ASSERT(fsize <= uint16_max); \
+ MPT_ASSERT(fsize <= uint16_max); \
const uint16 size = fsize; \
mpt::IO::WriteIntLE<uint16>(f, size); \
}
Modified: trunk/OpenMPT/soundlib/Load_mod.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mod.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Load_mod.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -623,7 +623,7 @@
// Files that have restart pos == 0x78: action's batman by DJ Uno (M.K.), 3ddance.mod (M15, so handled by ReadM15),
// VALLEY.MOD (M.K.), WormsTDC.MOD (M.K.), ZWARTZ.MOD (M.K.)
// Files that have an order list longer than 0x78 with restart pos = 0x78: my_shoe_is_barking.mod, papermix.mod
- ASSERT(m_nRestartPos != 0x78 || m_nRestartPos + 1u >= realOrders);
+ MPT_ASSERT(m_nRestartPos != 0x78 || m_nRestartPos + 1u >= realOrders);
if(m_nRestartPos >= 128 || m_nRestartPos + 1u >= realOrders || m_nRestartPos == 0x78)
{
m_nRestartPos = 0;
@@ -839,7 +839,7 @@
{
return false;
}
- ASSERT(sampleHeader.finetune == 0);
+ MPT_ASSERT(sampleHeader.finetune == 0);
totalSampleLen += Samples[smp].nLength;
Modified: trunk/OpenMPT/soundlib/Load_okt.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_okt.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Load_okt.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -274,7 +274,7 @@
default:
m->command = m->param = 0;
- //ASSERT(false);
+ //MPT_ASSERT(false);
break;
}
}
Modified: trunk/OpenMPT/soundlib/Load_psm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_psm.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Load_psm.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -531,7 +531,7 @@
}
case PSMChunk::idPPAN: // PPAN - Channel panning table (used in Sinaria)
// In some Sinaria tunes, this is actually longer than 2 * channels...
- ASSERT(subChunkHead.length >= m_nChannels * 2u);
+ MPT_ASSERT(subChunkHead.length >= m_nChannels * 2u);
for(CHANNELINDEX chn = 0; chn < m_nChannels; chn++)
{
if(!subChunk.CanRead(2))
Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -701,7 +701,7 @@
size_t curPos = ftell(f);
if(curPos < sampleHeaderOffset)
{
- ASSERT(sampleHeaderOffset - curPos < 16);
+ MPT_ASSERT(sampleHeaderOffset - curPos < 16);
fwrite(filler, sampleHeaderOffset - curPos, 1, f);
}
@@ -717,7 +717,7 @@
continue;
}
- ASSERT((ftell(f) % 16) == 0);
+ MPT_ASSERT((ftell(f) % 16) == 0);
patternOffsets[pat] = static_cast<uint16>(ftell(f) / 16);
SwapBytesLE(patternOffsets[pat]);
Modified: trunk/OpenMPT/soundlib/Load_umx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_umx.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Load_umx.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -273,7 +273,7 @@
// Can't bother to implement property reading, as no UMX files I've seen so far use properties for the relevant objects,
// and only the UAX files in the Unreal 1997/98 beta seem to use this and still load just fine when ignoring it.
// If it should be necessary to implement this, check CUnProperty.cpp in http://ut-files.com/index.php?dir=Utilities/&file=utcms_source.zip
- ASSERT(false);
+ MPT_ASSERT(false);
continue;
}
#else
Modified: trunk/OpenMPT/soundlib/Load_wav.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_wav.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Load_wav.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -26,8 +26,8 @@
bool CopyWavChannel(ModSample &sample, const FileReader &file, size_t channelIndex, size_t numChannels, SampleConversion conv = SampleConversion())
//-------------------------------------------------------------------------------------------------------------------------------------------------
{
- ASSERT(sample.GetNumChannels() == 1);
- ASSERT(sample.GetElementarySampleSize() == sizeof(typename SampleConversion::output_t));
+ MPT_ASSERT(sample.GetNumChannels() == 1);
+ MPT_ASSERT(sample.GetElementarySampleSize() == sizeof(typename SampleConversion::output_t));
const size_t offset = channelIndex * sizeof(typename SampleConversion::input_t) * SampleConversion::input_inc;
Modified: trunk/OpenMPT/soundlib/ModSequence.h
===================================================================
--- trunk/OpenMPT/soundlib/ModSequence.h 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/ModSequence.h 2014-10-19 15:19:34 UTC (rev 4446)
@@ -38,13 +38,13 @@
// Initialize default sized sequence.
void Init();
- PATTERNINDEX& operator[](const size_t i) {ASSERT(i < m_nSize); return m_pArray[i];}
- const PATTERNINDEX& operator[](const size_t i) const {ASSERT(i < m_nSize); return m_pArray[i];}
+ PATTERNINDEX& operator[](const size_t i) {MPT_ASSERT(i < m_nSize); return m_pArray[i];}
+ const PATTERNINDEX& operator[](const size_t i) const {MPT_ASSERT(i < m_nSize); return m_pArray[i];}
PATTERNINDEX& At(const size_t i) {return (*this)[i];}
const PATTERNINDEX& At(const size_t i) const {return (*this)[i];}
- PATTERNINDEX& Last() {ASSERT(m_nSize > 0); return m_pArray[m_nSize-1];}
- const PATTERNINDEX& Last() const {ASSERT(m_nSize > 0); return m_pArray[m_nSize-1];}
+ PATTERNINDEX& Last() {MPT_ASSERT(m_nSize > 0); return m_pArray[m_nSize-1];}
+ const PATTERNINDEX& Last() const {MPT_ASSERT(m_nSize > 0); return m_pArray[m_nSize-1];}
// Returns last accessible index, i.e. GetLength() - 1. Behaviour is undefined if length is zero.
ORDERINDEX GetLastIndex() const {return m_nSize - 1;}
Modified: trunk/OpenMPT/soundlib/RowVisitor.cpp
===================================================================
--- trunk/OpenMPT/soundlib/RowVisitor.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/RowVisitor.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -175,7 +175,7 @@
void RowVisitor::ResetPatternLoop(ORDERINDEX order, ROWINDEX startRow)
//--------------------------------------------------------------------
{
- ASSERT(order == currentOrder); // Shouldn't trigger, unless we're jumping around in the GUI during a pattern loop.
+ MPT_ASSERT(order == currentOrder); // Shouldn't trigger, unless we're jumping around in the GUI during a pattern loop.
// Unvisit all rows that are in the visited row buffer, until we hit the start row for this pattern loop.
ROWINDEX row = ROWINDEX_INVALID;
Modified: trunk/OpenMPT/soundlib/SampleFormatConverters.h
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormatConverters.h 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/SampleFormatConverters.h 2014-10-19 15:19:34 UTC (rev 4446)
@@ -733,7 +733,7 @@
void CopyInterleavedSampleStreams(typename SampleConversion::output_t * MPT_RESTRICT outBuf, const typename SampleConversion::input_t * MPT_RESTRICT inBuf, size_t numFrames, size_t numChannels, std::vector<SampleConversion> &conv)
//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
{
- ASSERT(conv.size() >= numChannels);
+ MPT_ASSERT(conv.size() >= numChannels);
CopyInterleavedSampleStreams(outBuf, inBuf, numFrames, numChannels, &(conv[0]));
}
@@ -743,8 +743,8 @@
size_t CopyMonoSample(ModSample &sample, const char *sourceBuffer, size_t sourceSize, SampleConversion conv = SampleConversion())
//-------------------------------------------------------------------------------------------------------------------------------
{
- ASSERT(sample.GetNumChannels() == 1);
- ASSERT(sample.GetElementarySampleSize() == sizeof(typename SampleConversion::output_t));
+ MPT_ASSERT(sample.GetNumChannels() == 1);
+ MPT_ASSERT(sample.GetElementarySampleSize() == sizeof(typename SampleConversion::output_t));
const size_t frameSize = SampleConversion::input_inc;
const size_t countFrames = std::min<size_t>(sourceSize / frameSize, sample.nLength);
@@ -767,8 +767,8 @@
size_t CopyStereoInterleavedSample(ModSample &sample, const char *sourceBuffer, size_t sourceSize, SampleConversion conv = SampleConversion())
//--------------------------------------------------------------------------------------------------------------------------------------------
{
- ASSERT(sample.GetNumChannels() == 2);
- ASSERT(sample.GetElementarySampleSize() == sizeof(typename SampleConversion::output_t));
+ MPT_ASSERT(sample.GetNumChannels() == 2);
+ MPT_ASSERT(sample.GetElementarySampleSize() == sizeof(typename SampleConversion::output_t));
const size_t frameSize = 2 * SampleConversion::input_inc;
const size_t countFrames = std::min<size_t>(sourceSize / frameSize, sample.nLength);
@@ -795,8 +795,8 @@
size_t CopyStereoSplitSample(ModSample &sample, const char *sourceBuffer, size_t sourceSize, SampleConversion conv = SampleConversion())
//--------------------------------------------------------------------------------------------------------------------------------------
{
- ASSERT(sample.GetNumChannels() == 2);
- ASSERT(sample.GetElementarySampleSize() == sizeof(typename SampleConversion::output_t));
+ MPT_ASSERT(sample.GetNumChannels() == 2);
+ MPT_ASSERT(sample.GetElementarySampleSize() == sizeof(typename SampleConversion::output_t));
const size_t sampleSize = SampleConversion::input_inc;
const size_t sourceSizeLeft = std::min<size_t>(sample.nLength * SampleConversion::input_inc, sourceSize);
@@ -837,7 +837,7 @@
{
const size_t inSize = sizeof(typename SampleConversion::input_t);
- ASSERT(sample.GetElementarySampleSize() == sizeof(typename SampleConversion::output_t));
+ MPT_ASSERT(sample.GetElementarySampleSize() == sizeof(typename SampleConversion::output_t));
size_t numSamples = sample.nLength * sample.GetNumChannels();
LimitMax(numSamples, sourceSize / inSize);
Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -1950,9 +1950,9 @@
int8 *sampleData8 = static_cast<int8 *>(sample.pSample) + offset;
int16 *sampleData16 = static_cast<int16 *>(sample.pSample) + offset;
- ASSERT((bps <= 8 && sample.GetElementarySampleSize() == 1) || (bps > 8 && sample.GetElementarySampleSize() == 2));
- ASSERT(modChannels <= FLAC__stream_decoder_get_channels(decoder));
- ASSERT(bps == FLAC__stream_decoder_get_bits_per_sample(decoder));
+ MPT_ASSERT((bps <= 8 && sample.GetElementarySampleSize() == 1) || (bps > 8 && sample.GetElementarySampleSize() == 2));
+ MPT_ASSERT(modChannels <= FLAC__stream_decoder_get_channels(decoder));
+ MPT_ASSERT(bps == FLAC__stream_decoder_get_bits_per_sample(decoder));
MPT_UNREFERENCED_PARAMETER(decoder); // decoder is unused if ASSERTs are compiled out
// Do the sample conversion
@@ -2232,7 +2232,7 @@
SampleToFLAC32<int16>(sampleData, sample.pSample, numSamples);
} else
{
- ASSERT(false);
+ MPT_ASSERT(false);
}
// Do the actual conversion.
Modified: trunk/OpenMPT/soundlib/SampleIO.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleIO.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/SampleIO.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -63,7 +63,7 @@
return 0;
}
- ASSERT(sampleSize >= sample.GetSampleSizeInBytes());
+ MPT_ASSERT(sampleSize >= sample.GetSampleSizeInBytes());
//////////////////////////////////////////////////////
// 8-Bit / Mono / PCM
@@ -577,7 +577,7 @@
}
}
- ASSERT(filePosition + bytesRead <= file.GetLength());
+ MPT_ASSERT(filePosition + bytesRead <= file.GetLength());
file.Seek(filePosition + bytesRead);
return bytesRead;
}
Modified: trunk/OpenMPT/soundlib/Snd_flt.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_flt.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Snd_flt.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -31,7 +31,7 @@
//-----------------------------------------------------------------------
{
float Fc;
- ASSERT(nCutOff < 128);
+ MPT_ASSERT(nCutOff < 128);
if(m_SongFlags[SONG_EXFILTERRANGE])
Fc = 110.0f * pow(2.0f, 0.25f + ((float)(nCutOff * (flt_modifier + 256))) / (20.0f * 512.0f));
else
Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -1494,7 +1494,7 @@
if(IsCompatibleMode(TRK_IMPULSETRACKER))
{
// I think this is not necessary, so let's check if it is actually called.
- ASSERT(pChn->nVibratoPos == 0);
+ MPT_ASSERT(pChn->nVibratoPos == 0);
pChn->nVibratoPos = 0;
}
}
@@ -4229,7 +4229,7 @@
float CSoundFile::CalculateSmoothParamChange(float currentValue, float param) const
//---------------------------------------------------------------------------------
{
- ASSERT(GetNumTicksOnCurrentRow() > m_PlayState.m_nTickCount);
+ MPT_ASSERT(GetNumTicksOnCurrentRow() > m_PlayState.m_nTickCount);
const UINT ticksLeft = GetNumTicksOnCurrentRow() - m_PlayState.m_nTickCount;
if(ticksLeft > 1)
{
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -195,7 +195,7 @@
mpt::IO::WriteIntLE<int16>(file, fsize); \
} else if(only_this_code == fcode)\
{ \
- ASSERT(fixedsize == fsize); \
+ MPT_ASSERT(fixedsize == fsize); \
} \
if(only_this_code == fcode || only_this_code == Util::MaxValueOfType(only_this_code)) \
{ \
@@ -224,7 +224,7 @@
/* hackish workaround to resolve mismatched size values: */ \
/* nResampling was a long time declared as uint32 but these macro tables used uint16 and UINT. */ \
/* This worked fine on little-endian, on big-endian not so much. Thus support writing size-mismatched fields. */ \
- ASSERT(fixedsize >= fsize); \
+ MPT_ASSERT(fixedsize >= fsize); \
type tmp = (type)(input-> name ); \
tmp = SwapBytesReturnLE(tmp); \
fwrite(&tmp , 1 , fsize , file); \
@@ -244,7 +244,7 @@
// ------------------------------------------------------------------------
#define WRITE_MPTHEADER_array_member(name,type,code,arraysize) \
STATIC_ASSERT(sizeof(type) == sizeof(input-> name [0])); \
- ASSERT(sizeof(input->name) >= sizeof(type) * arraysize);\
+ MPT_ASSERT(sizeof(input->name) >= sizeof(type) * arraysize);\
fcode = MULTICHAR_STRING_TO_INT(#code);\
fsize = sizeof( type ) * arraysize;\
if(only_this_code == Util::MaxValueOfType(only_this_code)) \
@@ -253,7 +253,7 @@
mpt::IO::WriteIntLE<int16>(file, fsize); \
} else if(only_this_code == fcode)\
{ \
- /* ASSERT(fixedsize <= fsize); */ \
+ /* MPT_ASSERT(fixedsize <= fsize); */ \
fsize = fixedsize; /* just trust the size we got passed */ \
} \
if(only_this_code == fcode || only_this_code == Util::MaxValueOfType(only_this_code)) \
@@ -299,7 +299,7 @@
if(only_this_code != Util::MaxValueOfType(only_this_code))
{
- ASSERT(fixedsize > 0);
+ MPT_ASSERT(fixedsize > 0);
}
WRITE_MPTHEADER_sized_member( nFadeOut , UINT , FO.. )
@@ -1430,7 +1430,7 @@
const char *CSoundFile::GetSampleName(SAMPLEINDEX nSample) const
//--------------------------------------------------------------
{
- ASSERT(nSample <= GetNumSamples());
+ MPT_ASSERT(nSample <= GetNumSamples());
if (nSample < MAX_SAMPLES)
{
return m_szNames[nSample];
@@ -1447,7 +1447,7 @@
if((nInstr >= MAX_INSTRUMENTS) || (!Instruments[nInstr]))
return "";
- ASSERT(nInstr <= GetNumInstruments());
+ MPT_ASSERT(nInstr <= GetNumInstruments());
return Instruments[nInstr]->name;
}
@@ -1696,7 +1696,7 @@
}
if(s_pTuningsSharedBuiltIn->GetNumTunings() == 0)
{
- ASSERT(false);
+ MPT_ASSERT(false);
CTuningRTI* pT = new CTuningRTI;
//Note: Tuning collection class handles deleting.
pT->CreateGeometric(1,1);
@@ -1919,7 +1919,7 @@
bufferCount--;
m_PlayState.m_dBufferDiff++;
}
- ASSERT(abs(m_PlayState.m_dBufferDiff) < 1);
+ MPT_ASSERT(abs(m_PlayState.m_dBufferDiff) < 1);
retval = bufferCount;
}
break;
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2014-10-19 15:19:34 UTC (rev 4446)
@@ -881,8 +881,8 @@
UINT GetPeriodFromNote(UINT note, int nFineTune, UINT nC5Speed) const;
UINT GetFreqFromPeriod(UINT period, int nPeriodFrac = 0) const;
// Misc functions
- ModSample &GetSample(SAMPLEINDEX sample) { ASSERT(sample <= m_nSamples && sample < CountOf(Samples)); return Samples[sample]; }
- const ModSample &GetSample(SAMPLEINDEX sample) const { ASSERT(sample <= m_nSamples && sample < CountOf(Samples)); return Samples[sample]; }
+ ModSample &GetSample(SAMPLEINDEX sample) { MPT_ASSERT(sample <= m_nSamples && sample < CountOf(Samples)); return Samples[sample]; }
+ const ModSample &GetSample(SAMPLEINDEX sample) const { MPT_ASSERT(sample <= m_nSamples && sample < CountOf(Samples)); return Samples[sample]; }
UINT MapMidiInstrument(DWORD dwProgram, UINT nChannel, UINT nNote);
size_t ITInstrToMPT(FileReader &file, ModInstrument &ins, uint16 trkvers);
Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -130,7 +130,7 @@
CSoundFile::samplecount_t CSoundFile::Read(samplecount_t count, IAudioReadTarget &target)
//---------------------------------------------------------------------------------------
{
- ALWAYS_ASSERT(m_MixerSettings.IsValid());
+ MPT_ASSERT_ALWAYS(m_MixerSettings.IsValid());
bool mixPlugins = false;
for(PLUGINDEX i = 0; i < MAX_MIXPLUGINS; ++i)
@@ -158,7 +158,7 @@
m_SongFlags.set(SONG_ENDREACHED);
} else if(ReadNote())
{ // render next tick (normal progress)
- ASSERT(m_PlayState.m_nBufferCount > 0);
+ MPT_ASSERT(m_PlayState.m_nBufferCount > 0);
#ifdef MODPLUG_TRACKER
// Save pattern cue points for WAV rendering here (if we reached a new pattern, that is.)
if(IsRenderingToDisc() && (m_PatternCuePoints.empty() || m_PlayState.m_nCurrentOrder != m_PatternCuePoints.back().order))
@@ -185,7 +185,7 @@
{ // end of song reached, fade it out
if(FadeSong(FADESONGDELAY)) // sets m_nBufferCount xor returns false
{ // FadeSong sets m_nBufferCount here
- ASSERT(m_PlayState.m_nBufferCount > 0);
+ MPT_ASSERT(m_PlayState.m_nBufferCount > 0);
m_SongFlags.set(SONG_FADINGSONG);
} else
{
@@ -201,7 +201,7 @@
break; // mix done
}
- ASSERT(m_PlayState.m_nBufferCount > 0); // assert that we have actually something to do
+ MPT_ASSERT(m_PlayState.m_nBufferCount > 0); // assert that we have actually something to do
const samplecount_t countChunk = std::min<samplecount_t>(MIXBUFFERSIZE, std::min<samplecount_t>(m_PlayState.m_nBufferCount, countToRender));
Modified: trunk/OpenMPT/soundlib/Tables.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Tables.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/Tables.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -863,8 +863,8 @@
double coeff = fsinc * lowpass_factor;
#ifdef MPT_INTMIXER
int n = (int)std::floor(coeff * (1<<SINC_QUANTSHIFT) + 0.5);
- ASSERT(n <= int16_max);
- ASSERT(n > int16_min);
+ MPT_ASSERT(n <= int16_max);
+ MPT_ASSERT(n > int16_min);
*psinc++ = static_cast<SINC_TYPE>(n);
#else
*psinc++ = static_cast<SINC_TYPE>(coeff);
Modified: trunk/OpenMPT/soundlib/WAVTools.cpp
===================================================================
--- trunk/OpenMPT/soundlib/WAVTools.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/WAVTools.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -334,7 +334,7 @@
#ifdef _DEBUG
fseek(f, 0, SEEK_END);
size_t realSize = static_cast<size_t>(ftell(f));
- ASSERT(totalSize == realSize);
+ MPT_ASSERT(totalSize == realSize);
#endif
if(fileOwned)
{
@@ -425,7 +425,7 @@
} else
{
// Should never happen - did we calculate a wrong memory size?
- ASSERT(false);
+ MPT_ASSERT(false);
}
}
position += numBytes;
Modified: trunk/OpenMPT/soundlib/load_j2b.cpp
===================================================================
--- trunk/OpenMPT/soundlib/load_j2b.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/load_j2b.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -798,7 +798,7 @@
else
madeWithTracker += "old version)";
- ASSERT(mainChunk.unknown == LittleEndian(0xFF0001C5) || mainChunk.unknown == LittleEndian(0x35800716) || mainChunk.unknown == LittleEndian(0xFF00FFFF));
+ MPT_ASSERT(mainChunk.unknown == LittleEndian(0xFF0001C5) || mainChunk.unknown == LittleEndian(0x35800716) || mainChunk.unknown == LittleEndian(0xFF00FFFF));
mpt::String::Read<mpt::String::maybeNullTerminated>(songName, mainChunk.songname);
@@ -918,7 +918,7 @@
{
continue;
}
- ASSERT(instrHeader.headSize + 4 == sizeof(instrHeader));
+ MPT_ASSERT(instrHeader.headSize + 4 == sizeof(instrHeader));
const INSTRUMENTINDEX instr = instrHeader.index + 1;
if(instr >= MAX_INSTRUMENTS)
@@ -936,7 +936,7 @@
// Read sample sub-chunks (RIFF nesting ftw)
ChunkReader::ChunkList<AMFFRiffChunk> sampleChunkFile = chunk.ReadChunks<AMFFRiffChunk>(2);
std::vector<FileReader> sampleChunks = sampleChunkFile.GetAllChunks(AMFFRiffChunk::idRIFF);
- ASSERT(sampleChunks.size() == instrHeader.numSamples);
+ MPT_ASSERT(sampleChunks.size() == instrHeader.numSamples);
for(std::vector<FileReader>::iterator smpIter = sampleChunks.begin(); smpIter != sampleChunks.end(); smpIter++)
{
Modified: trunk/OpenMPT/soundlib/tuning.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuning.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/tuning.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -255,7 +255,7 @@
if(GetType() == TT_GROUPGEOMETRIC)
return m_RatioTableFine[GetRefNote(note) * GetFineStepCount() + sd - 1];
- ASSERT(false);
+ MPT_ASSERT(false);
return m_RatioTableFine[0]; //Shouldn't happen.
}
else //Calculating ratio 'on the fly'.
Modified: trunk/OpenMPT/soundlib/tuningbase.h
===================================================================
--- trunk/OpenMPT/soundlib/tuningbase.h 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/soundlib/tuningbase.h 2014-10-19 15:19:34 UTC (rev 4446)
@@ -307,7 +307,7 @@
{
{ // avoid integer overload
//if(vrp.first == STEPINDEXTYPE_MIN && vrp.second == STEPINDEXTYPE_MAX) return true;
- ASSERT(NOTEINDEXTYPE_MIN / 2 < vrp.first && vrp.second < NOTEINDEXTYPE_MAX / 2);
+ MPT_ASSERT(NOTEINDEXTYPE_MIN / 2 < vrp.first && vrp.second < NOTEINDEXTYPE_MAX / 2);
if(NOTEINDEXTYPE_MIN / 2 >= vrp.first || vrp.second >= NOTEINDEXTYPE_MAX / 2) return true;
}
if(fs > static_cast<USTEPINDEXTYPE>(STEPINDEXTYPE_MAX) / (vrp.second - vrp.first + 1)) return false;
Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp 2014-10-19 12:41:02 UTC (rev 4445)
+++ trunk/OpenMPT/test/test.cpp 2014-10-19 15:19:34 UTC (rev 4446)
@@ -877,7 +877,7 @@
template <>
inline Test::CustomSettingsTestType FromSettingValue(const SettingValue &val)
{
- ASSERT(val.GetTypeTag() == "myType");
+ MPT_ASSERT(val.GetTypeTag() == "myType");
std::string xy = val.as<std::string>();
if(xy.empty())
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
