diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-05-12 09:46:25 +1000 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-05-12 09:46:25 +1000 |
| commit | 792302fbdfa37cf680234353dbe973886c4b2898 (patch) | |
| tree | e999bcf6dbfe12cf19ae49b1762cd71d724aa8ae /gr-blocks/lib/interleaved_short_to_complex_impl.cc | |
| parent | a7adf4689b58d91bd88d0dc948b017e1d42bff01 (diff) | |
| parent | 9851f2377d099ffe72312375e7f761f66b664aa6 (diff) | |
Merge branch 'next' into runtime_pimpl
Catches up runtime_pimpl branch with changes on next since
the initial branch start.
Conflicts:
gnuradio-runtime/include/gnuradio/constants.h
gnuradio-runtime/include/gnuradio/tags.h
gnuradio-runtime/include/gr_block_detail.h
gnuradio-runtime/include/gr_buffer.h
gnuradio-runtime/lib/CMakeLists.txt
gnuradio-runtime/lib/gr_block.cc
gnuradio-runtime/lib/gr_block_detail.cc
gnuradio-runtime/lib/gr_block_executor.cc
gnuradio-runtime/lib/gr_buffer.cc
gnuradio-runtime/lib/gr_realtime.cc
gr-blocks/lib/interleaved_short_to_complex_impl.cc
Diffstat (limited to 'gr-blocks/lib/interleaved_short_to_complex_impl.cc')
| -rw-r--r-- | gr-blocks/lib/interleaved_short_to_complex_impl.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gr-blocks/lib/interleaved_short_to_complex_impl.cc b/gr-blocks/lib/interleaved_short_to_complex_impl.cc index 62823c2ee5..962b29b37c 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) : sync_decimator("interleaved_short_to_complex", - io_signature::make (1, 1, sizeof(short)), - io_signature::make (1, 1, sizeof(gr_complex)), - 2) + gr::io_signature::make (1, 1, (vector_input?2:1)*sizeof(short)), + gr::io_signature::make (1, 1, sizeof(gr_complex)), + vector_input?1:2), + d_vector_input(vector_input) { } |