smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

specialize isfinite for MSVC compat

Browse source
This commit is contained in:
Robin Gareus 2016-02-28 12:07:00 +01:00
parent 19dc2a09db
commit 489753e866
2 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/ardour/automation_control.cc
View file

@ -18,6 +18,7 @@
*/ */
#include <math.h>
#include <iostream> #include <iostream>
#include "ardour/automation_control.h" #include "ardour/automation_control.h"
#include "ardour/automation_watch.h" #include "ardour/automation_watch.h"
@ -29,6 +30,14 @@
#include "i18n.h" #include "i18n.h"
#ifdef COMPILER_MSVC
#include <float.h>
// C99 'isfinite()' is not available in MSVC.
#define isfinite_local(val) (bool)_finite((double)val)
#else
#define isfinite_local isfinite
#endif
using namespace std; using namespace std;
using namespace ARDOUR; using namespace ARDOUR;
using namespace PBD; using namespace PBD;
@ -199,7 +208,7 @@ AutomationControl::internal_to_interface (double val) const
double double
AutomationControl::interface_to_internal (double val) const AutomationControl::interface_to_internal (double val) const
{ {
if (!isfinite (val)) { if (!isfinite_local (val)) {
val = 0; val = 0;
} }
if (_desc.logarithmic) { if (_desc.logarithmic) {

20
libs/vamp-plugins/ebu_r128_proc.cc
View file

@ -24,6 +24,14 @@
#include <math.h> #include <math.h>
#include "ebu_r128_proc.h" #include "ebu_r128_proc.h"
#ifdef COMPILER_MSVC
#include <float.h>
// C99 'isfinite()' is not available in MSVC.
#define isfinite_local(val) (bool)_finite((double)val)
#else
#define isfinite_local isfinite
#endif
namespace Fons { namespace Fons {
float Ebu_r128_hist::_bin_power [100] = { 0.0f }; float Ebu_r128_hist::_bin_power [100] = { 0.0f };
@ -223,8 +231,8 @@ void Ebu_r128_proc::process (int nfram, const float *const *input)
_wrind &= 63; _wrind &= 63;
_loudness_M = addfrags (8); _loudness_M = addfrags (8);
_loudness_S = addfrags (60); _loudness_S = addfrags (60);
if (!isfinite(_loudness_M) || _loudness_M < -200.f) _loudness_M = -200.0f; if (!isfinite_local(_loudness_M) || _loudness_M < -200.f) _loudness_M = -200.0f;
if (!isfinite(_loudness_S) || _loudness_S < -200.f) _loudness_S = -200.0f; if (!isfinite_local(_loudness_S) || _loudness_S < -200.f) _loudness_S = -200.0f;
if (_loudness_M > _maxloudn_M) _maxloudn_M = _loudness_M; if (_loudness_M > _maxloudn_M) _maxloudn_M = _loudness_M;
if (_loudness_S > _maxloudn_S) _maxloudn_S = _loudness_S; if (_loudness_S > _maxloudn_S) _maxloudn_S = _loudness_S;
if (_integr) if (_integr)
@ -329,10 +337,10 @@ float Ebu_r128_proc::detect_process (int nfram)
} }
if (_nchan == 1) si = 2 * sj; if (_nchan == 1) si = 2 * sj;
else si += _chan_gain [i] * sj; else si += _chan_gain [i] * sj;
S->_z1 = !isfinite(z1) ? 0 : z1; S->_z1 = !isfinite_local(z1) ? 0 : z1;
S->_z2 = !isfinite(z2) ? 0 : z2; S->_z2 = !isfinite_local(z2) ? 0 : z2;
S->_z3 = !isfinite(z3) ? 0 : z3; S->_z3 = !isfinite_local(z3) ? 0 : z3;
S->_z4 = !isfinite(z4) ? 0 : z4; S->_z4 = !isfinite_local(z4) ? 0 : z4;
} }
return si; return si;
} }