From ba9066ef2213b61cf39f7aadb732451f14de5855 Mon Sep 17 00:00:00 2001 From: Tim O'Shea <tim.oshea753@gmail.com> Date: Thu, 18 Apr 2013 18:22:54 -0400 Subject: blocks: interleaved_short_to_complex switch to volk, allow vector short input option --- gr-blocks/lib/interleaved_short_to_complex_impl.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gr-blocks/lib/interleaved_short_to_complex_impl.cc') diff --git a/gr-blocks/lib/interleaved_short_to_complex_impl.cc b/gr-blocks/lib/interleaved_short_to_complex_impl.cc index 1be6fdc9d4..9a28d9c974 100644 --- a/gr-blocks/lib/interleaved_short_to_complex_impl.cc +++ b/gr-blocks/lib/interleaved_short_to_complex_impl.cc @@ -31,16 +31,17 @@ namespace gr { namespace blocks { - interleaved_short_to_complex::sptr interleaved_short_to_complex::make() + interleaved_short_to_complex::sptr interleaved_short_to_complex::make(bool vector_input) { - return gnuradio::get_initial_sptr(new interleaved_short_to_complex_impl()); + return gnuradio::get_initial_sptr(new interleaved_short_to_complex_impl(vector_input)); } - interleaved_short_to_complex_impl::interleaved_short_to_complex_impl() + interleaved_short_to_complex_impl::interleaved_short_to_complex_impl(bool vector_input) : gr_sync_decimator("interleaved_short_to_complex", - gr_make_io_signature (1, 1, sizeof(short)), + gr_make_io_signature (1, 1, (vector_input?2:1)*sizeof(short)), gr_make_io_signature (1, 1, sizeof(gr_complex)), - 2) + vector_input?1:2), + d_vector_input(vector_input) { } -- cgit v1.2.3