[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r3872 - gnuradio/branches/developers/jcorgan/hier/gnur
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r3872 - gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime |
|
Date: |
Fri, 27 Oct 2006 03:29:41 -0600 (MDT) |
Author: jcorgan
Date: 2006-10-27 03:29:40 -0600 (Fri, 27 Oct 2006)
New Revision: 3872
Added:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
Removed:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.cc
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.h
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.i
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/Makefile.am
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.h
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/runtime.i
Log:
Rename gr_tier_block to gr_hier_block2. Make name parm const.
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/Makefile.am
2006-10-27 03:44:28 UTC (rev 3871)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/Makefile.am
2006-10-27 09:29:40 UTC (rev 3872)
@@ -33,7 +33,7 @@
gr_basic_block.cc \
gr_block.cc \
gr_block_detail.cc \
- gr_tier_block.cc \
+ gr_hier_block2.cc \
gr_buffer.cc \
gr_dispatcher.cc \
gr_error_handler.cc \
@@ -65,7 +65,7 @@
gr_basic_block.h \
gr_block.h \
gr_block_detail.h \
- gr_tier_block.h \
+ gr_hier_block2.h \
gr_buffer.h \
gr_complex.h \
gr_dispatcher.h \
@@ -101,7 +101,7 @@
gr_basic_block.i \
gr_block.i \
gr_block_detail.i \
- gr_tier_block.i \
+ gr_hier_block2.i \
gr_buffer.i \
gr_dispatcher.i \
gr_error_handler.i \
Copied:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
(from rev 3871,
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.cc)
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
(rev 0)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
2006-10-27 09:29:40 UTC (rev 3872)
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 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 2, 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_hier_block2.h>
+
+gr_hier_block2_sptr gr_make_hier_block2(const std::string name,
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature)
+{
+ return gr_hier_block2_sptr(new gr_hier_block2(name, input_signature,
output_signature));
+}
+
+gr_hier_block2::gr_hier_block2(const std::string name,
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature)
+ : gr_basic_block(name, input_signature, output_signature)
+{
+}
+
+gr_hier_block2::~gr_hier_block2 ()
+{
+}
Copied:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
(from rev 3871,
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.h)
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
(rev 0)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
2006-10-27 09:29:40 UTC (rev 3872)
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 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 2, 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_GR_HIER_BLOCK2_H
+#define INCLUDED_GR_HIER_BLOCK2_H
+
+#include <gr_basic_block.h>
+
+/*!
+ * \brief public constructor for gr_hier_block2
+ */
+gr_hier_block2_sptr gr_make_hier_block2(const std::string name,
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature);
+
+/*!
+ * \brief gr_hier_block2 - Hierarchical container class for gr_block's
+ *
+ */
+class gr_hier_block2 : public gr_basic_block
+{
+private:
+ gr_hier_block2(const std::string name,
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature);
+
+ friend gr_hier_block2_sptr gr_make_hier_block2(const std::string name,
+ gr_io_signature_sptr
input_signature,
+ gr_io_signature_sptr
output_signature);
+
+public:
+ ~gr_hier_block2();
+};
+
+#endif /* INCLUDED_GR_HIER_BLOCK2_H */
Copied:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
(from rev 3871,
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.i)
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
(rev 0)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
2006-10-27 09:29:40 UTC (rev 3872)
@@ -0,0 +1,44 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005 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 2, 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.
+ */
+
+class gr_hier_block2;
+typedef boost::shared_ptr<gr_hier_block2> gr_hier_block2_sptr;
+%template(gr_hier_block2_sptr) boost::shared_ptr<gr_hier_block2>;
+
+%rename(hier_block2) gr_make_hier_block2;
+gr_hier_block2_sptr gr_make_hier_block2(const std::string name,
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature);
+
+/*!
+ * \brief gr_hier_block2 - Container class for tree of gr_block's
+ *
+ */
+class gr_hier_block2
+{
+ gr_hier_block2(const std::string name,
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature);
+
+public:
+ ~gr_hier_block2 ();
+};
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.h
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.h
2006-10-27 03:44:28 UTC (rev 3871)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.h
2006-10-27 09:29:40 UTC (rev 3872)
@@ -32,7 +32,7 @@
class gr_basic_block;
class gr_block;
class gr_block_detail;
-class gr_tier_block;
+class gr_hier_block2;
class gr_io_signature;
class gr_buffer;
class gr_buffer_reader;
@@ -40,7 +40,7 @@
typedef boost::shared_ptr<gr_basic_block> gr_basic_block_sptr;
typedef boost::shared_ptr<gr_block> gr_block_sptr;
typedef boost::shared_ptr<gr_block_detail> gr_block_detail_sptr;
-typedef boost::shared_ptr<gr_tier_block> gr_tier_block_sptr;
+typedef boost::shared_ptr<gr_hier_block2> gr_hier_block2_sptr;
typedef boost::shared_ptr<gr_io_signature> gr_io_signature_sptr;
typedef boost::shared_ptr<gr_buffer> gr_buffer_sptr;
typedef boost::shared_ptr<gr_buffer_reader> gr_buffer_reader_sptr;
Deleted:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.cc
Deleted:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.h
Deleted:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.i
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/runtime.i
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/runtime.i
2006-10-27 03:44:28 UTC (rev 3871)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/runtime.i
2006-10-27 09:29:40 UTC (rev 3872)
@@ -26,7 +26,7 @@
#include <gr_buffer.h>
#include <gr_block.h>
#include <gr_block_detail.h>
-#include <gr_tier_block.h>
+#include <gr_hier_block2.h>
#include <gr_single_threaded_scheduler.h>
#include <gr_message.h>
#include <gr_msg_handler.h>
@@ -41,7 +41,7 @@
%include <gr_basic_block.i>
%include <gr_block.i>
%include <gr_block_detail.i>
-%include <gr_tier_block.i>
+%include <gr_hier_block2.i>
%include <gr_swig_block_magic.i>
%include <gr_single_threaded_scheduler.i>
%include <gr_message.i>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r3872 - gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime,
jcorgan <=