summaryrefslogtreecommitdiff
path: root/gr-blocks/include
diff options
context:
space:
mode:
authorJohnathan Corgan <jcorgan@corganenterprises.com>2012-06-27 06:50:22 -0700
committerJohnathan Corgan <jcorgan@corganenterprises.com>2012-06-27 06:50:22 -0700
commitbe1219b0623bbceb5bca6a6f6774f0669f52bdde (patch)
tree508b604e7871a5ec8e14ec398632928a0d33ff79 /gr-blocks/include
parent3de0c77ed91e417c0b54972a78ffbad62f4bbb87 (diff)
blocks: added gr::blocks::interleaved_short_to_complex
Diffstat (limited to 'gr-blocks/include')
-rw-r--r--gr-blocks/include/blocks/CMakeLists.txt1
-rw-r--r--gr-blocks/include/blocks/complex_to_interleaved_short.h2
-rw-r--r--gr-blocks/include/blocks/interleaved_short_to_complex.h49
3 files changed, 51 insertions, 1 deletions
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt
index e56c7b87ca..9616db3a6b 100644
--- a/gr-blocks/include/blocks/CMakeLists.txt
+++ b/gr-blocks/include/blocks/CMakeLists.txt
@@ -99,6 +99,7 @@ install(FILES
float_to_short.h
float_to_uchar.h
int_to_float.h
+ interleaved_complex_to_short.h
multiply_cc.h
multiply_ff.h
multiply_const_cc.h
diff --git a/gr-blocks/include/blocks/complex_to_interleaved_short.h b/gr-blocks/include/blocks/complex_to_interleaved_short.h
index 33cbddf6b2..f5e91123ce 100644
--- a/gr-blocks/include/blocks/complex_to_interleaved_short.h
+++ b/gr-blocks/include/blocks/complex_to_interleaved_short.h
@@ -37,7 +37,7 @@ namespace gr {
{
public:
- // gr::blocks::complex_to_interleaved_short_ff::sptr
+ // gr::blocks::complex_to_interleaved_short::sptr
typedef boost::shared_ptr<complex_to_interleaved_short> sptr;
static sptr make();
diff --git a/gr-blocks/include/blocks/interleaved_short_to_complex.h b/gr-blocks/include/blocks/interleaved_short_to_complex.h
new file mode 100644
index 0000000000..40e96fc46a
--- /dev/null
+++ b/gr-blocks/include/blocks/interleaved_short_to_complex.h
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_INTERLEAVED_SHORT_TO_COMPLEX_H
+#define INCLUDED_BLOCKS_INTERLEAVED_SHORT_TO_COMPLEX_H
+
+#include <blocks/api.h>
+#include <gr_sync_decimator.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert stream of interleaved shorts to a stream of complex
+ * \ingroup converter_blk
+ */
+ class BLOCKS_API interleaved_short_to_complex : virtual public gr_sync_decimator
+ {
+ public:
+
+ // gr::blocks::interleaved_short_to_complex::sptr
+ typedef boost::shared_ptr<interleaved_short_to_complex> sptr;
+
+ static sptr make();
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_INTERLEAVED_SHORT_TO_COMPLEX_H */