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/frequency_modulator_fc_impl.cc | |
| parent | e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff) | |
| parent | 0fa219774dcf9141ae91204f948c029b05673f3f (diff) | |
Merged in next_docs branch.
Diffstat (limited to 'gr-analog/lib/frequency_modulator_fc_impl.cc')
| -rw-r--r-- | gr-analog/lib/frequency_modulator_fc_impl.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gr-analog/lib/frequency_modulator_fc_impl.cc b/gr-analog/lib/frequency_modulator_fc_impl.cc index 2da7ee15f1..9fb741690b 100644 --- a/gr-analog/lib/frequency_modulator_fc_impl.cc +++ b/gr-analog/lib/frequency_modulator_fc_impl.cc @@ -25,8 +25,8 @@ #endif #include "frequency_modulator_fc_impl.h" -#include <gr_io_signature.h> -#include <gr_fxpt.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/fxpt.h> #include <math.h> #include <boost/math/special_functions/trunc.hpp> @@ -41,9 +41,9 @@ namespace gr { } frequency_modulator_fc_impl::frequency_modulator_fc_impl(double sensitivity) - : gr_sync_block("frequency_modulator_fc", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(gr_complex))), + : sync_block("frequency_modulator_fc", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(gr_complex))), d_sensitivity(sensitivity), d_phase(0) { } @@ -70,8 +70,8 @@ namespace gr { float oi, oq; - gr_int32 angle = gr_fxpt::float_to_fixed (d_phase); - gr_fxpt::sincos(angle, &oq, &oi); + gr_int32 angle = gr::fxpt::float_to_fixed (d_phase); + gr::fxpt::sincos(angle, &oq, &oi); out[i] = gr_complex(oi, oq); } |