diff options
| author | Marcus Müller <marcus@hostalia.de> | 2018-03-22 22:29:21 +0100 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-03-22 22:32:12 +0100 |
| commit | d3aba0022c3317bc8856f05612cafcdca4b4d667 (patch) | |
| tree | 9dd5ddbf8db2f357754a73b4eed4d0cc8924360a /gr-analog/lib/squelch_base_ff_impl.cc | |
| parent | 9ae5d4cd3da84ce7e5a0c2abe7fec1ff8d229ae8 (diff) | |
| parent | 886ce0f13b4135c1206c26786e06a524e92fc271 (diff) | |
Merge branch 'fix_cmake_cxx_standard' of https://github.com/noc0lour/gnuradio into noc0lour-fix_cmake_cxx_standard
Diffstat (limited to 'gr-analog/lib/squelch_base_ff_impl.cc')
| -rw-r--r-- | gr-analog/lib/squelch_base_ff_impl.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gr-analog/lib/squelch_base_ff_impl.cc b/gr-analog/lib/squelch_base_ff_impl.cc index ea2d29bd97..2f164be363 100644 --- a/gr-analog/lib/squelch_base_ff_impl.cc +++ b/gr-analog/lib/squelch_base_ff_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2006,2012 Free Software Foundation, Inc. + * Copyright 2004,2006,2012,2018 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,6 +26,7 @@ #include "squelch_base_ff_impl.h" #include <gnuradio/io_signature.h> +#include <gnuradio/math.h> #include <pmt/pmt.h> namespace gr { @@ -120,7 +121,7 @@ namespace gr { case ST_ATTACK: // FIXME: precalculate window for speed - d_envelope = 0.5-std::cos(M_PI*(++d_ramped)/d_ramp)/2.0; + d_envelope = 0.5-std::cos(GR_M_PI*(++d_ramped)/d_ramp)/2.0; // use >= in case d_ramp is set to lower value elsewhere if(d_ramped >= d_ramp) { @@ -132,7 +133,7 @@ namespace gr { case ST_DECAY: // FIXME: precalculate window for speed - d_envelope = 0.5-std::cos(M_PI*(--d_ramped)/d_ramp)/2.0; + d_envelope = 0.5-std::cos(GR_M_PI*(--d_ramped)/d_ramp)/2.0; if(d_ramped == 0.0) { d_state = ST_MUTED; add_item_tag(0, nitems_written(0) + j, d_eob_key, pmt::PMT_NIL); |