Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / gnuradio-core / src / lib / runtime / gr_msg_queue.i

diff --git a/gnuradio-core/src/lib/runtime/gr_msg_queue.i b/gnuradio-core/src/lib/runtime/gr_msg_queue.i
index 28292d66fb48517b26a9a7e32870181f7f8c8e54..9ca92b6ec8cded6c384b0b0c0543aafedd8939ef 100644 (file)
--- a/gnuradio-core/src/lib/runtime/gr_msg_queue.i
+++ b/gnuradio-core/src/lib/runtime/gr_msg_queue.i
@@ -1,12 +1,12 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,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 2, or (at your option)
+ * 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,
@@ -16,8 +16,8 @@
  * 
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
  */
 
 class gr_msg_queue;
@@ -32,14 +32,8 @@ gr_msg_queue_sptr gr_make_msg_queue(unsigned limit=0);
  */
 %ignore gr_msg_queue;
 class gr_msg_queue : public gr_msg_handler {
-  omni_mutex           d_mutex;
-  omni_condition       d_cond;
-  gr_message_sptr      d_head;
-  gr_message_sptr      d_tail;
-  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 +81,7 @@ public:
  * 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 +95,7 @@ public:
     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 %{