hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

lmms_math: C++11 updates

Browse Source
This commit is contained in:
Lukas W
2017-03-26 12:32:12 +02:00
parent 84d662409c
commit de3b344edd
4 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/lmms_math.h
View File

@@ -26,7 +26,7 @@
#ifndef LMMS_MATH_H
#define LMMS_MATH_H
#include <stdint.h>
#include <cstdint>
#include "lmms_constants.h"
#include "lmmsconfig.h"
#include <QtCore/QtGlobal>
@@ -34,25 +34,8 @@
#include <cmath>
using namespace std;
#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU) || defined (__FreeBSD__) || defined(__OpenBSD__)
#ifndef isnanf
#define isnanf(x) isnan(x)
#endif
#ifndef isinff
#define isinff(x) isinf(x)
#endif
#ifndef _isnanf
#define _isnanf(x) isnan(x)
#endif
#ifndef _isinff
#define _isinff(x) isinf(x)
#endif
#ifndef exp10
#define exp10(x) pow( 10.0, x )
#endif
#ifndef exp10f
#define exp10f(x) powf( 10.0f, x )
#endif
#define exp10(x) std::pow( 10.0, x )
#endif
#ifdef __INTEL_COMPILER
@@ -259,9 +242,9 @@ static inline float safeAmpToDbfs( float amp )
//! @return Linear amplitude
static inline float safeDbfsToAmp( float dbfs )
{
return isinff( dbfs )
return isinf( dbfs )
? 0.0f
: exp10f( dbfs * 0.05f );
: exp10( dbfs * 0.05f );
}
@@ -279,7 +262,7 @@ static inline float ampToDbfs( float amp )
//! @return Linear amplitude
static inline float dbfsToAmp( float dbfs )
{
return exp10f( dbfs * 0.05f );
return exp10( dbfs * 0.05f );
}