From 9cd145e6c3cd2ca4c2a67e104d227424d09db49c Mon Sep 17 00:00:00 2001 From: Nicholas McCarthy <namccart@gmail.com> Date: Mon, 24 Mar 2014 18:29:44 -0400 Subject: block interleave/deinterleave with statefull deinterleave --- gr-blocks/include/gnuradio/blocks/deinterleave.h | 6 +++--- gr-blocks/include/gnuradio/blocks/interleave.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gr-blocks/include/gnuradio') diff --git a/gr-blocks/include/gnuradio/blocks/deinterleave.h b/gr-blocks/include/gnuradio/blocks/deinterleave.h index 45452089e5..a79649fd73 100644 --- a/gr-blocks/include/gnuradio/blocks/deinterleave.h +++ b/gr-blocks/include/gnuradio/blocks/deinterleave.h @@ -24,7 +24,7 @@ #define INCLUDED_BLOCKS_DEINTERLEAVE_H #include <gnuradio/blocks/api.h> -#include <gnuradio/sync_decimator.h> +#include <gnuradio/block.h> namespace gr { namespace blocks { @@ -33,7 +33,7 @@ namespace gr { * \brief deinterleave a single input into N outputs * \ingroup stream_operators_blk */ - class BLOCKS_API deinterleave : virtual public sync_decimator + class BLOCKS_API deinterleave : virtual public block { public: // gr::blocks::deinterleave::sptr @@ -44,7 +44,7 @@ namespace gr { * * \param itemsize stream itemsize */ - static sptr make(size_t itemsize); + static sptr make(size_t itemsize, unsigned int blocksize = 1); }; } /* namespace blocks */ diff --git a/gr-blocks/include/gnuradio/blocks/interleave.h b/gr-blocks/include/gnuradio/blocks/interleave.h index 7c28d54c53..811c3e3a29 100644 --- a/gr-blocks/include/gnuradio/blocks/interleave.h +++ b/gr-blocks/include/gnuradio/blocks/interleave.h @@ -24,7 +24,7 @@ #define INCLUDED_BLOCKS_INTERLEAVE_H #include <gnuradio/blocks/api.h> -#include <gnuradio/sync_interpolator.h> +#include <gnuradio/block.h> namespace gr { namespace blocks { @@ -33,7 +33,7 @@ namespace gr { * \brief interleave N inputs into a single output * \ingroup stream_operators_blk */ - class BLOCKS_API interleave : virtual public sync_interpolator + class BLOCKS_API interleave : virtual public block { public: // gr::blocks::interleave::sptr @@ -44,7 +44,7 @@ namespace gr { * * \param itemsize stream itemsize */ - static sptr make(size_t itemsize); + static sptr make(size_t itemsize, unsigned int blocksize = 1); }; } /* namespace blocks */ -- cgit v1.2.3