[Commit-gnuradio] r10350 - in gnuradio/trunk/gnuradio-core/src/lib: filter gengen runtime swig

[michaelld]

Author: michaelld
Date: 2009-01-30 19:48:58 -0700 (Fri, 30 Jan 2009)
New Revision: 10350

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h
   gnuradio/trunk/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.i
   gnuradio/trunk/gnuradio-core/src/lib/gengen/gengen.i
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_msg_queue.i
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.i
   gnuradio/trunk/gnuradio-core/src/lib/swig/sw_filter.i
   gnuradio/trunk/gnuradio-core/src/lib/swig/sw_io.i
Log:
Merged in misc_fixes branch.



Modified: gnuradio/trunk/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h   
2009-01-31 01:19:25 UTC (rev 10349)
+++ gnuradio/trunk/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h   
2009-01-31 02:48:58 UTC (rev 10350)
@@ -44,9 +44,10 @@
 
   // Override to calculate new weight from old, corresponding input
   virtual void update_tap(float &tap, const gr_complex &in) = 0;
-  
+
+  gr_adaptive_fir_ccf(const char *name, int decimation, const 
std::vector<float> &taps);
+
 public:
-  gr_adaptive_fir_ccf(const char *name, int decimation, const 
std::vector<float> &taps);
   void set_taps(const std::vector<float> &taps);
 
   int work(int noutput_items,

Modified: gnuradio/trunk/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.i   
2009-01-31 01:19:25 UTC (rev 10349)
+++ gnuradio/trunk/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.i   
2009-01-31 02:48:58 UTC (rev 10350)
@@ -22,7 +22,7 @@
 
 class gr_adaptive_fir_ccf : public gr_sync_decimator
 {
-private:
+protected:
   gr_adaptive_fir_ccf(char *name, int decimation, const std::vector<float> 
&taps);
 
 public:

Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/gengen.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gengen.i        2009-01-31 
01:19:25 UTC (rev 10349)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gengen.i        2009-01-31 
02:48:58 UTC (rev 10350)
@@ -1,3 +1,25 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009 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.
+ */
+
 %{
 #include "gr_endianness.h"
 #include "gr_sig_source_waveform.h"

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_msg_queue.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_msg_queue.i 2009-01-31 
01:19:25 UTC (rev 10349)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_msg_queue.i 2009-01-31 
02:48:58 UTC (rev 10350)
@@ -39,7 +39,7 @@
   int                  d_count;
 
 public:
-  gr_msg_queue();
+  gr_msg_queue(unsigned int limit);
   ~gr_msg_queue();
 
   //! Generic msg_handler method: insert the message.
@@ -87,7 +87,7 @@
  * functions into the gr.msg_queue wrapper class, so that everything
  * appears normal.  (An evil laugh is heard in the distance...)
  */
-%inline {
+%inline %{
   gr_message_sptr gr_py_msg_queue__delete_head(gr_msg_queue_sptr q) {
     gr_message_sptr msg;
     Py_BEGIN_ALLOW_THREADS;            // release global interpreter lock
@@ -101,7 +101,7 @@
     q->insert_tail(msg);               // possibly blocking call
     Py_END_ALLOW_THREADS;              // acquire global interpreter lock
   }
-}
+%}
 
 // smash in new python delete_head and insert_tail methods...
 %pythoncode %{

Modified: 
gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.i 
2009-01-31 01:19:25 UTC (rev 10349)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.i 
2009-01-31 02:48:58 UTC (rev 10350)
@@ -42,11 +42,10 @@
   gr_single_threaded_scheduler (const std::vector<gr_block_sptr> &modules);
 };
 
-%inline {
+%inline %{
   void sts_pyrun (gr_single_threaded_scheduler_sptr s) {
     Py_BEGIN_ALLOW_THREADS;            // release global interpreter lock
     s->run ();
     Py_END_ALLOW_THREADS;              // acquire global interpreter lock
   }
-}
-
+%}

Modified: gnuradio/trunk/gnuradio-core/src/lib/swig/sw_filter.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/sw_filter.i       2009-01-31 
01:19:25 UTC (rev 10349)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/sw_filter.i       2009-01-31 
02:48:58 UTC (rev 10350)
@@ -5,16 +5,16 @@
  * 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
+ * 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 Filter Public License for more details.
+ * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU Filter Public License along
+ * 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.
  */

Modified: gnuradio/trunk/gnuradio-core/src/lib/swig/sw_io.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/sw_io.i   2009-01-31 01:19:25 UTC 
(rev 10349)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/sw_io.i   2009-01-31 02:48:58 UTC 
(rev 10350)
@@ -5,16 +5,16 @@
  * 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
+ * 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 Io Public License for more details.
+ * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU Io Public License along
+ * 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.
  */