ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

'gtk2_ardour' - 'std::isinf' + 'std::isnan' are not available in MSVC (at least, not VC8)

Browse Source
This commit is contained in:
John Emmas 2013-10-03 09:48:19 +01:00
parent f763e370c5
commit 904367748c
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk2_ardour/automation_line.cc
View File

@ -17,6 +17,17 @@
*/
#ifdef COMPILER_MSVC
#include <float.h>
// 'std::isinf()' and 'std::isnan()' are not available in MSVC.
#define isinf(val) !((bool)_finite((double)val))
#define isnan(val) (bool)_isnan((double)val)
#else
using std::isnan;
using std::isinf;
#endif
#include <cmath>
#include <climits>
#include <vector>
@ -933,7 +944,7 @@ AutomationLine::reset_callback (const Evoral::ControlList& events)
model_to_view_coord (tx, ty);
if (std::isnan (tx) || std::isnan (ty)) {
if (isnan (tx) || isnan (ty)) {
warning << string_compose (_("Ignoring illegal points on AutomationLine \"%1\""),
_name) << endmsg;
continue;

15
gtk2_ardour/plugin_eq_gui.cc
View File

@ -18,6 +18,17 @@
*/
#ifdef COMPILER_MSVC
#include <float.h>
// 'std::isinf()' and 'std::isnan()' are not available in MSVC.
#define isinf(val) !((bool)_finite((double)val))
#define isnan(val) (bool)_isnan((double)val)
#else
using std::isnan;
using std::isinf;
#endif
#include "plugin_eq_gui.h"
#include "fft.h"
@ -765,13 +776,13 @@ PluginEqGui::plot_signal_amplitude_difference(Gtk::Widget *w, cairo_t *cr)
}
*/
if (std::isinf(power)) {
if (isinf(power)) {
if (power < 0) {
power = _min_dB - 1.0;
} else {
power = _max_dB - 1.0;
}
} else if (std::isnan(power)) {
} else if (isnan(power)) {
power = _min_dB - 1.0;
}