diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
| commit | bb01988e75d50d82cbb44c1a49c86c1d08f05665 (patch) | |
| tree | 0528dac14476d37f2cde7374a8fcb3428f879c69 /gr-analog/lib/quadrature_demod_cf_impl.cc | |
| parent | e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff) | |
| parent | 0fa219774dcf9141ae91204f948c029b05673f3f (diff) | |
Merged in next_docs branch.
Diffstat (limited to 'gr-analog/lib/quadrature_demod_cf_impl.cc')
| -rw-r--r-- | gr-analog/lib/quadrature_demod_cf_impl.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gr-analog/lib/quadrature_demod_cf_impl.cc b/gr-analog/lib/quadrature_demod_cf_impl.cc index 9490ba6bed..583de4dba4 100644 --- a/gr-analog/lib/quadrature_demod_cf_impl.cc +++ b/gr-analog/lib/quadrature_demod_cf_impl.cc @@ -25,8 +25,8 @@ #endif #include "quadrature_demod_cf_impl.h" -#include <gr_io_signature.h> -#include <gr_math.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/math.h> namespace gr { namespace analog { @@ -39,9 +39,9 @@ namespace gr { } quadrature_demod_cf_impl::quadrature_demod_cf_impl(float gain) - : gr_sync_block("quadrature_demod_cf", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(float))), + : sync_block("quadrature_demod_cf", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(float))), d_gain(gain) { set_history(2); // we need to look at the previous value @@ -62,7 +62,7 @@ namespace gr { for(int i = 0; i < noutput_items; i++) { gr_complex product = in[i] * conj(in[i-1]); - out[i] = d_gain * gr_fast_atan2f(imag(product), real(product)); + out[i] = d_gain * gr::fast_atan2f(imag(product), real(product)); } return noutput_items; |