X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplugin_eq_gui.cc;h=13c475e27c1b4896a7a11b5f58ae18cf8bb12f2e;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=4bf2a5f87913e8143b67c0bc9aa61446c84e9632;hpb=e466ce40ad1ba591543020cb7c0aa15dbebef81e;p=ardour.git diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc index 4bf2a5f879..13c475e27c 100644 --- a/gtk2_ardour/plugin_eq_gui.cc +++ b/gtk2_ardour/plugin_eq_gui.cc @@ -18,33 +18,32 @@ */ +#include +#include + #ifdef COMPILER_MSVC #include - -// 'std::isinf()' and 'std::isnan()' are not available in MSVC. -#define isinf(val) !((bool)_finite((double)val)) -#define isnan(val) (bool)_isnan((double)val) +/* isinf() & isnan() are C99 standards, which older MSVC doesn't provide */ +#define ISINF(val) !((bool)_finite((double)val)) +#define ISNAN(val) (bool)_isnan((double)val) #else -using std::isnan; -using std::isinf; +#define ISINF(val) std::isinf((val)) +#define ISNAN(val) std::isnan((val)) #endif -#include "plugin_eq_gui.h" -#include "fft.h" +#include +#include +#include -#include "ardour_ui.h" -#include "gui_thread.h" #include "ardour/audio_buffer.h" #include "ardour/data_type.h" #include "ardour/chan_mapping.h" #include "ardour/session.h" -#include -#include -#include - -#include -#include +#include "plugin_eq_gui.h" +#include "fft.h" +#include "ardour_ui.h" +#include "gui_thread.h" #include "i18n.h" @@ -776,13 +775,13 @@ PluginEqGui::plot_signal_amplitude_difference(Gtk::Widget *w, cairo_t *cr) } */ - if (isinf(power)) { + if (ISINF(power)) { if (power < 0) { power = _min_dB - 1.0; } else { power = _max_dB - 1.0; } - } else if (isnan(power)) { + } else if (ISNAN(power)) { power = _min_dB - 1.0; }