[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4228 - in gnuradio/branches/developers/eb/swig-split:
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r4228 - in gnuradio/branches/developers/eb/swig-split: config gnuradio-core/src/lib/general gnuradio-core/src/lib/runtime gnuradio-core/src/lib/swig gnuradio-examples/python/usrp gr-audio-portaudio/src gr-error-correcting-codes/src/lib/libecc |
|
Date: |
Fri, 5 Jan 2007 17:40:25 -0700 (MST) |
Author: eb
Date: 2007-01-05 17:40:24 -0700 (Fri, 05 Jan 2007)
New Revision: 4228
Added:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_block.cc
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_block.h
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_block.i
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_decimator.cc
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_decimator.h
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_decimator.i
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_interpolator.cc
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_interpolator.i
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/gnuradio_swig_python.py
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/sw_filter.i
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/sw_general.i
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/sw_io.i
Removed:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_block.cc
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_block.h
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_block.i
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_decimator.cc
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_decimator.h
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_decimator.i
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_interpolator.cc
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_interpolator.h
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_interpolator.i
Modified:
gnuradio/branches/developers/eb/swig-split/config/grc_gnuradio_core.m4
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/Makefile.am
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/general.i
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/Makefile.am
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/runtime.i
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/Makefile.am
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/gnuradio.i
gnuradio/branches/developers/eb/swig-split/gnuradio-examples/python/usrp/Makefile.am
gnuradio/branches/developers/eb/swig-split/gr-audio-portaudio/src/
gnuradio/branches/developers/eb/swig-split/gr-error-correcting-codes/src/lib/libecc/Makefile.am
Log:
Work-in-progress. Doesn't currently pass make distcheck.
Modified: gnuradio/branches/developers/eb/swig-split/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/developers/eb/swig-split/config/grc_gnuradio_core.m4
2007-01-04 22:23:04 UTC (rev 4227)
+++ gnuradio/branches/developers/eb/swig-split/config/grc_gnuradio_core.m4
2007-01-06 00:40:24 UTC (rev 4228)
@@ -58,7 +58,12 @@
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_core], [chmod +x
gnuradio-core/src/python/gnuradio/gr/run_tests])
- dnl kludge up initial swig dependency file
- AC_CONFIG_COMMANDS([swig_deps], [touch
gnuradio-core/src/lib/swig/gnuradio_swig_python.d])
+ dnl kludge up initial swig dependency files
+ AC_CONFIG_COMMANDS([swig_deps], [
+ touch gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.d
+ touch gnuradio-core/src/lib/swig/gnuradio_swig_py_general.d
+ touch gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.d
+ touch gnuradio-core/src/lib/swig/gnuradio_swig_py_io.d
+ ])
])
])
Modified:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/Makefile.am
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/Makefile.am
2007-01-04 22:23:04 UTC (rev 4227)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/Makefile.am
2007-01-06 00:40:24 UTC (rev 4228)
@@ -192,9 +192,6 @@
gr_stream_to_vector.cc \
gr_streams_to_stream.cc \
gr_streams_to_vector.cc \
- gr_sync_block.cc \
- gr_sync_decimator.cc \
- gr_sync_interpolator.cc \
gr_test.cc \
gr_threshold_ff.cc \
gr_throttle.cc \
@@ -322,9 +319,6 @@
gr_stream_to_vector.h \
gr_streams_to_stream.h \
gr_streams_to_vector.h \
- gr_sync_block.h \
- gr_sync_decimator.h \
- gr_sync_interpolator.h \
gr_test_types.h \
gr_test.h \
gr_threshold_ff.h \
@@ -448,9 +442,6 @@
gr_stream_to_vector.i \
gr_streams_to_stream.i \
gr_streams_to_vector.i \
- gr_sync_block.i \
- gr_sync_decimator.i \
- gr_sync_interpolator.i \
gr_test.i \
gr_threshold_ff.i \
gr_throttle.i \
Modified:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/general.i
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/general.i
2007-01-04 22:23:04 UTC (rev 4227)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/general.i
2007-01-06 00:40:24 UTC (rev 4228)
@@ -22,9 +22,6 @@
%{
-#include <gr_sync_block.h>
-#include <gr_sync_decimator.h>
-#include <gr_sync_interpolator.h>
#include <gr_nop.h>
#include <gr_null_sink.h>
#include <gr_null_source.h>
@@ -115,9 +112,6 @@
#include <gr_bin_statistics_f.h>
%}
-%include "gr_sync_block.i"
-%include "gr_sync_decimator.i"
-%include "gr_sync_interpolator.i"
%include "gr_nop.i"
%include "gr_null_sink.i"
%include "gr_null_source.i"
Deleted:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_block.cc
Deleted:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_block.h
Deleted:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_block.i
Deleted:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_decimator.cc
Deleted:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_decimator.h
Deleted:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_decimator.i
Deleted:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_interpolator.cc
Deleted:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_interpolator.h
Deleted:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_interpolator.i
Modified:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/Makefile.am
2007-01-04 22:23:04 UTC (rev 4227)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/Makefile.am
2007-01-06 00:40:24 UTC (rev 4228)
@@ -51,6 +51,9 @@
gr_runtime.cc \
gr_runtime_impl.cc \
gr_single_threaded_scheduler.cc \
+ gr_sync_block.cc \
+ gr_sync_decimator.cc \
+ gr_sync_interpolator.cc \
gr_tmp_path.cc \
gr_vmcircbuf.cc \
gr_vmcircbuf_mmap_shm_open.cc \
@@ -92,6 +95,9 @@
gr_runtime_types.h \
gr_select_handler.h \
gr_single_threaded_scheduler.h \
+ gr_sync_block.h \
+ gr_sync_decimator.h \
+ gr_sync_interpolator.h \
gr_timer.h \
gr_tmp_path.h \
gr_types.h \
@@ -125,5 +131,8 @@
gr_runtime.i \
gr_simple_flowgraph.i \
gr_single_threaded_scheduler.i \
+ gr_sync_block.i \
+ gr_sync_decimator.i \
+ gr_sync_interpolator.i \
gr_swig_block_magic.i \
runtime.i
Copied:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_block.cc
(from rev 4203,
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_block.cc)
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_block.cc
(rev 0)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_block.cc
2007-01-06 00:40:24 UTC (rev 4228)
@@ -0,0 +1,68 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_sync_block.h>
+
+gr_sync_block::gr_sync_block (const std::string &name,
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature)
+ : gr_block(name, input_signature, output_signature)
+{
+ set_fixed_rate(true);
+}
+
+
+void
+gr_sync_block::forecast (int noutput_items, gr_vector_int
&ninput_items_required)
+{
+ unsigned ninputs = ninput_items_required.size();
+ for (unsigned i = 0; i < ninputs; i++)
+ ninput_items_required[i] = fixed_rate_noutput_to_ninput (noutput_items);
+}
+
+int
+gr_sync_block::fixed_rate_noutput_to_ninput(int noutput_items)
+{
+ return noutput_items + history() - 1;
+}
+
+int
+gr_sync_block::fixed_rate_ninput_to_noutput(int ninput_items)
+{
+ return std::max(0, ninput_items - (int)history() + 1);
+}
+
+int
+gr_sync_block::general_work (int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+{
+ int r = work (noutput_items, input_items, output_items);
+ if (r > 0)
+ consume_each (r);
+ return r;
+}
Copied:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_block.h
(from rev 4203,
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_block.h)
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_block.h
(rev 0)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_block.h
2007-01-06 00:40:24 UTC (rev 4228)
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_SYNC_BLOCK_H
+#define INCLUDED_GR_SYNC_BLOCK_H
+
+#include <gr_block.h>
+
+/*!
+ * \brief synchronous 1:1 input to output with history
+ * \ingroup block
+ *
+ * Override work to provide the signal processing implementation.
+ */
+class gr_sync_block : public gr_block
+{
+ protected:
+
+ gr_sync_block (const std::string &name,
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature);
+
+ public:
+
+ /*!
+ * \brief just like gr_block::general_work, only this arranges to call
consume_each for you
+ *
+ * The user must override work to define the signal processing code
+ */
+ virtual int work (int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items) = 0;
+
+
+ // gr_sync_block overrides these to assist work
+ void forecast (int noutput_items, gr_vector_int &ninput_items_required);
+ int general_work (int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+
+ int fixed_rate_ninput_to_noutput(int ninput);
+ int fixed_rate_noutput_to_ninput(int noutput);
+};
+
+#endif /* INCLUDED_GR_SYNC_BLOCK_H */
Copied:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_block.i
(from rev 4203,
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_block.i)
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_block.i
(rev 0)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_block.i
2007-01-06 00:40:24 UTC (rev 4228)
@@ -0,0 +1,29 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_sync_block : public gr_block
+{
+ protected:
+
+ gr_sync_block (const std::string &name,
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature);
+};
Copied:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_decimator.cc
(from rev 4203,
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_decimator.cc)
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_decimator.cc
(rev 0)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_decimator.cc
2007-01-06 00:40:24 UTC (rev 4228)
@@ -0,0 +1,69 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_sync_decimator.h>
+
+gr_sync_decimator::gr_sync_decimator (const std::string &name,
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature,
+ unsigned decimation)
+ : gr_sync_block (name, input_signature, output_signature)
+{
+ set_decimation (decimation);
+}
+
+void
+gr_sync_decimator::forecast (int noutput_items, gr_vector_int
&ninput_items_required)
+{
+ unsigned ninputs = ninput_items_required.size ();
+ for (unsigned i = 0; i < ninputs; i++)
+ ninput_items_required[i] = fixed_rate_noutput_to_ninput(noutput_items);
+}
+
+int
+gr_sync_decimator::fixed_rate_noutput_to_ninput(int noutput_items)
+{
+ return noutput_items * decimation() + history() - 1;
+}
+
+int
+gr_sync_decimator::fixed_rate_ninput_to_noutput(int ninput_items)
+{
+ return std::max(0, ninput_items - (int)history() + 1) / decimation();
+}
+
+int
+gr_sync_decimator::general_work (int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+{
+ int r = work (noutput_items, input_items, output_items);
+ if (r > 0)
+ consume_each (r * decimation ());
+ return r;
+}
+
Copied:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_decimator.h
(from rev 4203,
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_decimator.h)
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_decimator.h
(rev 0)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_decimator.h
2007-01-06 00:40:24 UTC (rev 4228)
@@ -0,0 +1,68 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_SYNC_DECIMATOR_H
+#define INCLUDED_GR_SYNC_DECIMATOR_H
+
+#include <gr_sync_block.h>
+
+/*!
+ * \brief synchronous N:1 input to output with history
+ * \ingroup block
+ *
+ * Override work to provide the signal processing implementation.
+ */
+class gr_sync_decimator : public gr_sync_block
+{
+ private:
+ unsigned d_decimation;
+
+ protected:
+
+ gr_sync_decimator (const std::string &name,
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature,
+ unsigned decimation);
+ public:
+
+ unsigned decimation () const { return d_decimation; }
+ void set_decimation (unsigned decimation)
+ {
+ d_decimation = decimation;
+ set_relative_rate (1.0 / decimation);
+ }
+
+ // gr_sync_decimator overrides these to assist work
+ void forecast (int noutput_items, gr_vector_int &ninput_items_required);
+ int general_work (int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+
+ // derived classes should override work
+
+ int fixed_rate_ninput_to_noutput(int ninput);
+ int fixed_rate_noutput_to_ninput(int noutput);
+};
+
+
+#endif /* INCLUDED_GR_SYNC_DECIMATOR_H */
Copied:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_decimator.i
(from rev 4203,
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_decimator.i)
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_decimator.i
(rev 0)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_decimator.i
2007-01-06 00:40:24 UTC (rev 4228)
@@ -0,0 +1,31 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_sync_decimator : public gr_sync_block
+{
+ protected:
+
+ gr_sync_decimator (const std::string &name,
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature,
+ unsigned decimation);
+};
Copied:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_interpolator.cc
(from rev 4203,
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_interpolator.cc)
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_interpolator.cc
(rev 0)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_interpolator.cc
2007-01-06 00:40:24 UTC (rev 4228)
@@ -0,0 +1,70 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_sync_interpolator.h>
+
+gr_sync_interpolator::gr_sync_interpolator (const std::string &name,
+ gr_io_signature_sptr
input_signature,
+ gr_io_signature_sptr
output_signature,
+ unsigned interpolation)
+ : gr_sync_block (name, input_signature, output_signature)
+{
+ set_interpolation (interpolation);
+}
+
+void
+gr_sync_interpolator::forecast (int noutput_items, gr_vector_int
&ninput_items_required)
+{
+ unsigned ninputs = ninput_items_required.size ();
+ for (unsigned i = 0; i < ninputs; i++)
+ ninput_items_required[i] = fixed_rate_noutput_to_ninput(noutput_items);
+}
+
+int
+gr_sync_interpolator::fixed_rate_noutput_to_ninput(int noutput_items)
+{
+ return noutput_items / interpolation() + history() - 1;
+}
+
+int
+gr_sync_interpolator::fixed_rate_ninput_to_noutout(int ninput_items)
+{
+ return std::max(0, ninput_items - (int)history() + 1) * interpolation();
+}
+
+int
+gr_sync_interpolator::general_work (int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+{
+ int r = work (noutput_items, input_items, output_items);
+ if (r > 0)
+ consume_each (r / interpolation ());
+ return r;
+}
+
+
Copied:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h
(from rev 4203,
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_interpolator.h)
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h
(rev 0)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h
2007-01-06 00:40:24 UTC (rev 4228)
@@ -0,0 +1,68 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_SYNC_INTERPOLATOR_H
+#define INCLUDED_GR_SYNC_INTERPOLATOR_H
+
+#include <gr_sync_block.h>
+
+/*!
+ * \brief synchronous 1:N input to output with history
+ * \ingroup block
+ *
+ * Override work to provide the signal processing implementation.
+ */
+class gr_sync_interpolator : public gr_sync_block
+{
+ private:
+ unsigned d_interpolation;
+
+ protected:
+ gr_sync_interpolator (const std::string &name,
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature,
+ unsigned interpolation);
+ public:
+
+ unsigned interpolation () const { return d_interpolation; }
+ void set_interpolation (unsigned interpolation)
+ {
+ d_interpolation = interpolation;
+ set_relative_rate (1.0 * interpolation);
+ set_output_multiple (interpolation);
+ }
+
+ // gr_sync_interpolator overrides these to assist work
+ void forecast (int noutput_items, gr_vector_int &ninput_items_required);
+ int general_work (int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+
+ // derived classes should override work
+
+ int fixed_rate_ninput_to_noutout(int ninput);
+ int fixed_rate_noutput_to_ninput(int noutput);
+};
+
+
+#endif /* INCLUDED_GR_SYNC_INTERPOLATOR_H */
Copied:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_interpolator.i
(from rev 4203,
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/general/gr_sync_interpolator.i)
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_interpolator.i
(rev 0)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/gr_sync_interpolator.i
2007-01-06 00:40:24 UTC (rev 4228)
@@ -0,0 +1,31 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_sync_interpolator : public gr_sync_block
+{
+ protected:
+
+ gr_sync_interpolator (const std::string &name,
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature,
+ unsigned interpolation);
+};
Modified:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/runtime.i
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/runtime.i
2007-01-04 22:23:04 UTC (rev 4227)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/runtime/runtime.i
2007-01-06 00:40:24 UTC (rev 4228)
@@ -36,6 +36,9 @@
#include <gr_dispatcher.h>
#include <gr_error_handler.h>
#include <gr_realtime.h>
+#include <gr_sync_block.h>
+#include <gr_sync_decimator.h>
+#include <gr_sync_interpolator.h>
%}
%include <gr_io_signature.i>
@@ -54,3 +57,6 @@
%include <gr_error_handler.i>
%include <gr_realtime.i>
%include <gr_runtime.i>
+%include <gr_sync_block.i>
+%include <gr_sync_decimator.i>
+%include <gr_sync_interpolator.i>
Property changes on:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
gnuradio_swig_python.cc
gnuradio_swig_python.py
swigrun.py
swigrun_wrap.c
Makefile.swigdeps.new
gnuradio_swig_python.d
gnuradio_swig_bug_workaround.h
gnuradio_swig_python.h
+ Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
swigrun.py
swigrun_wrap.c
Makefile.swigdeps.new
gnuradio_swig_py_runtime.d
gnuradio_swig_py_general.d
gnuradio_swig_py_filter.d
gnuradio_swig_py_io.d
gnuradio_swig_bug_workaround.h
gnuradio_swig_py_runtime.cc
gnuradio_swig_py_runtime.h
gnuradio_swig_py_runtime.py
gnuradio_swig_py_general.cc
gnuradio_swig_py_general.h
gnuradio_swig_py_general.py
gnuradio_swig_py_filter.cc
gnuradio_swig_py_filter.h
gnuradio_swig_py_filter.py
gnuradio_swig_py_io.cc
gnuradio_swig_py_io.h
gnuradio_swig_py_io.py
Modified:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/Makefile.am
2007-01-04 22:23:04 UTC (rev 4227)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/Makefile.am
2007-01-06 00:40:24 UTC (rev 4228)
@@ -37,65 +37,194 @@
LOCAL_IFILES = \
gnuradio.i \
- shared_ptr.i
+ shared_ptr.i \
+ sw_general.i \
+ sw_filter.i \
+ sw_io.i
+
ALL_IFILES = \
$(LOCAL_IFILES)
+
+
+# ----------------------------------------------------------------
+# We've split the previously monstrous gnuradio_swig_python into
+# 4 smaller pieces. This reduces compile time coupling and
+# creates smaller pieces for the compiler to digest.
+# prior to this change, on X86_64, g++'s resident set size was
+# 650MB!
+
BUILT_SOURCES = \
- gnuradio_swig_python.cc \
- gnuradio_swig_python.py \
- gnuradio_swig_python.h \
+ gnuradio_swig_py_runtime.cc \
+ gnuradio_swig_py_runtime.py \
+ gnuradio_swig_py_runtime.h \
+ gnuradio_swig_py_general.cc \
+ gnuradio_swig_py_general.py \
+ gnuradio_swig_py_general.h \
+ gnuradio_swig_py_filter.cc \
+ gnuradio_swig_py_filter.py \
+ gnuradio_swig_py_filter.h \
+ gnuradio_swig_py_io.cc \
+ gnuradio_swig_py_io.py \
+ gnuradio_swig_py_io.h \
gnuradio_swig_bug_workaround.h
+
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES)
+
+# ----------------------------------------------------------------
+# We break this up into 4 libraries...
+
+grgrlib_LTLIBRARIES = \
+ _gnuradio_swig_py_runtime.la \
+ _gnuradio_swig_py_general.la \
+ _gnuradio_swig_py_filter.la \
+ _gnuradio_swig_py_io.la
+
+
grgrpython_PYTHON = \
- gnuradio_swig_python.py
+ gnuradio_swig_python.py \
+ gnuradio_swig_py_runtime.py \
+ gnuradio_swig_py_general.py \
+ gnuradio_swig_py_filter.py \
+ gnuradio_swig_py_io.py
+# ----------------------------------------------------------------
+# Part 1: gnuradio.i -> gnuradio_swig_py_runtime
+#
+# We continue to call this gnuradio.i to avoid having to touch
+# lots of code in other modules
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES)
+_gnuradio_swig_py_runtime_la_SOURCES = \
+ gnuradio_swig_py_runtime.cc
+_gnuradio_swig_py_runtime_la_LIBADD = \
+ $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \
+ $(PYTHON_LDFLAGS) \
+ -lstdc++
+
+_gnuradio_swig_py_runtime_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
+
+# KLUDGE: Force runtime include of gnuradio_swig_py_runtime.d dependency file.
+# This is not guaranteed to be portable, but will probably work.
+# If it works, we have accurate dependencies for our swig stuff, which is good.
address@hidden@ @address@hidden/address@hidden@
+
+gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.h:
gnuradio_swig_py_runtime.cc
+
+gnuradio_swig_py_runtime.cc : gnuradio.i
+ if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_runtime.Td
-module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime.cc gnuradio.i ;\
+ then if test $(host_os) = mingw32; \
+ then sed 's,\\\\,/,g' <gnuradio_swig_py_runtime.Td
>gnuradio_swig_py_runtime.d; rm -f gnuradio_swig_py_runtime.Td; \
+ else mv -f gnuradio_swig_py_runtime.Td gnuradio_swig_py_runtime.d;
fi \
+ else rm -f gnuradio_swig_py_runtime.Td; exit 1; fi
+
+
# ----------------------------------------------------------------
-# _gnuradio_swig_python contains all the glue that implements
-# the gnuradio.gr python package
+# Part 2: sw_general.i -> gnuradio_swig_py_general
+#
-grgrlib_LTLIBRARIES = \
- _gnuradio_swig_python.la
+_gnuradio_swig_py_general_la_SOURCES = \
+ gnuradio_swig_py_general.cc
-_gnuradio_swig_python_la_SOURCES = \
- gnuradio_swig_python.cc
+_gnuradio_swig_py_general_la_LIBADD = \
+ $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \
+ $(PYTHON_LDFLAGS) \
+ -lstdc++
-_gnuradio_swig_python_la_LIBADD = \
+_gnuradio_swig_py_general_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
+
+# KLUDGE: Force general include of gnuradio_swig_py_general.d dependency file.
+# This is not guaranteed to be portable, but will probably work.
+# If it works, we have accurate dependencies for our swig stuff, which is good.
address@hidden@ @address@hidden/address@hidden@
+
+gnuradio_swig_py_general.py gnuradio_swig_py_general.h:
gnuradio_swig_py_general.cc
+
+gnuradio_swig_py_general.cc : sw_general.i
+ if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_general.Td
-module gnuradio_swig_py_general -o gnuradio_swig_py_general.cc sw_general.i ;\
+ then if test $(host_os) = mingw32; \
+ then sed 's,\\\\,/,g' <gnuradio_swig_py_general.Td
>gnuradio_swig_py_general.d; rm -f gnuradio_swig_py_general.Td; \
+ else mv -f gnuradio_swig_py_general.Td gnuradio_swig_py_general.d;
fi \
+ else rm -f gnuradio_swig_py_general.Td; exit 1; fi
+
+
+# ----------------------------------------------------------------
+# Part 3: sw_filter.i -> gnuradio_swig_py_filter
+#
+
+_gnuradio_swig_py_filter_la_SOURCES = \
+ gnuradio_swig_py_filter.cc
+
+
+_gnuradio_swig_py_filter_la_LIBADD = \
$(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \
- $(PYTHON_LDFLAGS) \
+ $(PYTHON_LDFLAGS) \
-lstdc++
-_gnuradio_swig_python_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+_gnuradio_swig_py_filter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-# KLUDGE: Force runtime include of gnuradio_swig_python.d dependency file.
+# KLUDGE: Force filter include of gnuradio_swig_py_filter.d dependency file.
# This is not guaranteed to be portable, but will probably work.
# If it works, we have accurate dependencies for our swig stuff, which is good.
address@hidden@ @address@hidden/address@hidden@
address@hidden@ @address@hidden/address@hidden@
-gnuradio_swig_python.py gnuradio_swig_python.h: gnuradio_swig_python.cc
+gnuradio_swig_py_filter.py gnuradio_swig_py_filter.h:
gnuradio_swig_py_filter.cc
-gnuradio_swig_python.cc : gnuradio.i
- if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_python.Td -module
gnuradio_swig_python -o gnuradio_swig_python.cc gnuradio.i ;\
+gnuradio_swig_py_filter.cc : sw_filter.i
+ if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_filter.Td
-module gnuradio_swig_py_filter -o gnuradio_swig_py_filter.cc sw_filter.i ;\
then if test $(host_os) = mingw32; \
- then sed 's,\\\\,/,g' <gnuradio_swig_python.Td
>gnuradio_swig_python.d; rm -f gnuradio_swig_python.Td; \
- else mv -f gnuradio_swig_python.Td gnuradio_swig_python.d; fi \
- else rm -f gnuradio_swig_python.Td; exit 1; fi
+ then sed 's,\\\\,/,g' <gnuradio_swig_py_filter.Td
>gnuradio_swig_py_filter.d; rm -f gnuradio_swig_py_filter.Td; \
+ else mv -f gnuradio_swig_py_filter.Td gnuradio_swig_py_filter.d;
fi \
+ else rm -f gnuradio_swig_py_filter.Td; exit 1; fi
-gnuradio_swig_bug_workaround.h : gnuradio_swig_python.cc
$(srcdir)/gen-swig-bug-fix
- $(srcdir)/gen-swig-bug-fix gnuradio_swig_python.cc $@
+# ----------------------------------------------------------------
+# Part 4: sw_io.i -> gnuradio_swig_py_io
+#
+_gnuradio_swig_py_io_la_SOURCES = \
+ gnuradio_swig_py_io.cc
+
+_gnuradio_swig_py_io_la_LIBADD = \
+ $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \
+ $(PYTHON_LDFLAGS) \
+ -lstdc++
+
+_gnuradio_swig_py_io_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
+
+# KLUDGE: Force io include of gnuradio_swig_py_io.d dependency file.
+# This is not guaranteed to be portable, but will probably work.
+# If it works, we have accurate dependencies for our swig stuff, which is good.
address@hidden@ @address@hidden/address@hidden@
+
+gnuradio_swig_py_io.py gnuradio_swig_py_io.h: gnuradio_swig_py_io.cc
+
+gnuradio_swig_py_io.cc : sw_io.i
+ if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_io.Td -module
gnuradio_swig_py_io -o gnuradio_swig_py_io.cc sw_io.i ;\
+ then if test $(host_os) = mingw32; \
+ then sed 's,\\\\,/,g' <gnuradio_swig_py_io.Td
>gnuradio_swig_py_io.d; rm -f gnuradio_swig_py_io.Td; \
+ else mv -f gnuradio_swig_py_io.Td gnuradio_swig_py_io.d; fi \
+ else rm -f gnuradio_swig_py_io.Td; exit 1; fi
+
+
# ----------------------------------------------------------------
+# FIXME As of swig 1.3.31, this still seems to be required...
+gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime.cc
$(srcdir)/gen-swig-bug-fix
+ $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime.cc $@
+
+# ----------------------------------------------------------------
+
# Don't distribute output of swig
dist-hook:
@for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
@@ -111,4 +240,8 @@
MOSTLYCLEANFILES = \
$(BUILT_SOURCES) *~ *.pyc
-DISTCLEANFILES = gnuradio_swig_python.d
+DISTCLEANFILES = \
+ gnuradio_swig_py_runtime.d \
+ gnuradio_swig_py_general.d \
+ gnuradio_swig_py_filter.d \
+ gnuradio_swig_py_io.d
Modified:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/gnuradio.i
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/gnuradio.i
2007-01-04 22:23:04 UTC (rev 4227)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/gnuradio.i
2007-01-06 00:40:24 UTC (rev 4228)
@@ -27,8 +27,7 @@
#ifndef SWIGIMPORTED
-// we set the module name on the command line (not any more)
-%module(directors="1") gnuradio_swig_python
+%module(directors="1") gnuradio_swig_py_runtime
#endif
////////////////////////////////////////////////////////////////////////
@@ -75,9 +74,9 @@
////////////////////////////////////////////////////////////////////////
%include <runtime.i>
-%include <general.i>
-%include <filter.i>
-%include <io.i>
+ // %include <general.i>
+ // %include <filter.i>
+ // %include <io.i>
// %include <atsc.i>
Added:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/gnuradio_swig_python.py
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/gnuradio_swig_python.py
(rev 0)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/gnuradio_swig_python.py
2007-01-06 00:40:24 UTC (rev 4228)
@@ -0,0 +1,26 @@
+#
+# 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 this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+# This file implements the old gnuradio_swig_python namespace
+
+from gnuradio_swig_py_runtime import *
+from gnuradio_swig_py_general import *
+from gnuradio_swig_py_filter import *
+from gnuradio_swig_py_io import *
Property changes on:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/gnuradio_swig_python.py
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/sw_filter.i
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/sw_filter.i
(rev 0)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/sw_filter.i
2007-01-06 00:40:24 UTC (rev 4228)
@@ -0,0 +1,36 @@
+/* -*- 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 Filter 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 Filter Public License for more details.
+ *
+ * You should have received a copy of the GNU Filter Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef SWIGIMPORTED
+%module(directors="1") gnuradio_swig_py_filter
+#endif
+
+
+%feature("autodoc", "1"); // generate python docstrings
+
+%include "exception.i"
+%import "gnuradio.i" // the common stuff
+
+%{
+#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
+%}
+
+%include "filter.i"
Added:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/sw_general.i
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/sw_general.i
(rev 0)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/sw_general.i
2007-01-06 00:40:24 UTC (rev 4228)
@@ -0,0 +1,36 @@
+/* -*- 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef SWIGIMPORTED
+%module(directors="1") gnuradio_swig_py_general
+#endif
+
+
+%feature("autodoc", "1"); // generate python docstrings
+
+%include "exception.i"
+%import "gnuradio.i" // the common stuff
+
+%{
+#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
+%}
+
+%include "general.i"
Added:
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/sw_io.i
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/sw_io.i
(rev 0)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/sw_io.i
2007-01-06 00:40:24 UTC (rev 4228)
@@ -0,0 +1,36 @@
+/* -*- 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 Io 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 Io Public License for more details.
+ *
+ * You should have received a copy of the GNU Io Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef SWIGIMPORTED
+%module(directors="1") gnuradio_swig_py_io
+#endif
+
+
+%feature("autodoc", "1"); // generate python docstrings
+
+%include "exception.i"
+%import "gnuradio.i" // the common stuff
+
+%{
+#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
+%}
+
+%include "io.i"
Modified:
gnuradio/branches/developers/eb/swig-split/gnuradio-examples/python/usrp/Makefile.am
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gnuradio-examples/python/usrp/Makefile.am
2007-01-04 22:23:04 UTC (rev 4227)
+++
gnuradio/branches/developers/eb/swig-split/gnuradio-examples/python/usrp/Makefile.am
2007-01-06 00:40:24 UTC (rev 4228)
@@ -44,6 +44,7 @@
usrp_rx_cfile.py \
usrp_rx_nogui.py \
usrp_siggen.py \
+ usrp_spectrum_sense.py \
usrp_tv_rcv_nogui.py \
usrp_tv_rcv.py \
usrp_wfm_rcv2_nogui.py \
Property changes on:
gnuradio/branches/developers/eb/swig-split/gr-audio-portaudio/src
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
usrp.py
usrp.cc
audio_oss.cc
audio_oss.py
audio_portaudio.py
audio_portaudio.cc
run_tests
+ Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
*.pyo
usrp.py
usrp.cc
audio_oss.cc
audio_oss.py
audio_portaudio.py
audio_portaudio.cc
run_tests
Modified:
gnuradio/branches/developers/eb/swig-split/gr-error-correcting-codes/src/lib/libecc/Makefile.am
===================================================================
---
gnuradio/branches/developers/eb/swig-split/gr-error-correcting-codes/src/lib/libecc/Makefile.am
2007-01-04 22:23:04 UTC (rev 4227)
+++
gnuradio/branches/developers/eb/swig-split/gr-error-correcting-codes/src/lib/libecc/Makefile.am
2007-01-06 00:40:24 UTC (rev 4228)
@@ -54,5 +54,3 @@
-lstdc++
MOSTLYCLEANFILES = *.loT *~
-
-CONFIG_CLEAN_FILES = *.in
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4228 - in gnuradio/branches/developers/eb/swig-split: config gnuradio-core/src/lib/general gnuradio-core/src/lib/runtime gnuradio-core/src/lib/swig gnuradio-examples/python/usrp gr-audio-portaudio/src gr-error-correcting-codes/src/lib/libecc,
eb <=