Merge branch 'master' of gnuradio.org:gnuradio

11 files changed, 36 insertions, 191 deletions

diff --git a/gnuradio-core/src/python/Makefile.am b/gnuradio-core/src/python/Makefile.am
index e50af8944..a90aaba5c 100644
--- a/gnuradio-core/src/python/Makefile.am
+++ b/gnuradio-core/src/python/Makefile.am
@@ -21,9 +21,10 @@
 
 include $(top_srcdir)/Makefile.common
 
+if PYTHON
 SUBDIRS = gnuradio bin
 
 noinst_PYTHON =			\
 	build_utils.py		\
 	build_utils_codes.py	
-
+endif
diff --git a/gnuradio-core/src/python/bin/Makefile.am b/gnuradio-core/src/python/bin/Makefile.am
index 0afd32767..6f9f162f1 100644
--- a/gnuradio-core/src/python/bin/Makefile.am
+++ b/gnuradio-core/src/python/bin/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2009 Free Software Foundation, Inc.
+# Copyright 2005,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -22,7 +22,7 @@
 include $(top_srcdir)/Makefile.common
 
 
-EXTRA_DIST = microtune.py
+EXTRA_DIST += microtune.py
 
 noinst_SCRIPTS = 		\
 	microtune.py		
diff --git a/gnuradio-core/src/python/gnuradio/Makefile.am b/gnuradio-core/src/python/gnuradio/Makefile.am
index a3f3518de..eff35e95c 100644
--- a/gnuradio-core/src/python/gnuradio/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2007,2008,2009,2010 Free Software Foundation, Inc.
+# Copyright 2004-2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -26,7 +26,6 @@ SUBDIRS = gr gru gruimpl blks2 blks2impl vocoder
 
 grpython_PYTHON = 			\
 	__init__.py			\
-	audio.py			\
 	eng_notation.py			\
 	eng_option.py			\
 	modulation_utils.py		\
diff --git a/gnuradio-core/src/python/gnuradio/audio.py b/gnuradio-core/src/python/gnuradio/audio.py
deleted file mode 100644
index f6e921f0e..000000000
--- a/gnuradio-core/src/python/gnuradio/audio.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# Copyright 2004,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 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.
-# 
-
-"""
-This is the 'generic' audio or soundcard interface.
-
-The behavior of this module is controlled by the [audio] audio_module
-configuration parameter.  If it is 'auto' we attempt to import modules
-from the known_modules list, using the first one imported successfully.
-
-If [audio] audio_module is not 'auto', we assume it's the name of
-an audio module and attempt to import it.
-"""
-
-__all__ = ['source', 'sink']
-
-from gnuradio import gr
-import sys
-
-source = None
-sink = None
-
-
-known_modules = (
-    'audio_alsa', 'audio_oss', 'audio_osx', 'audio_jack', 'audio_portaudio', 'audio_windows')
-
-
-def try_import(name):
-    """
-    Build a blob of code and try to execute it.
-    If it succeeds we will have set the globals source and sink
-    as side effects.
-
-    returns True or False
-    """
-    global source, sink
-    full_name = "gnuradio." + name
-    code = """
-import %s
-source = %s.source
-sink = %s.sink
-""" % (full_name, full_name, full_name)
-    try:
-        exec code in globals()
-        return True
-    except ImportError:
-        return False
-    
-
-def __init__ ():
-    p = gr.prefs()		# get preferences (config file) object
-    verbose = p.get_bool('audio', 'verbose', False)
-    module = p.get_string('audio', 'audio_module', 'auto')
-
-    if module == 'auto':        # search our list for the first one that we can import
-        for m in known_modules:
-            if try_import(m):
-                if verbose: sys.stderr.write('audio: using %s\n' % (m,))
-                return
-        raise ImportError, 'Unable to locate an audio module.'
-
-    else:                       # use the one the user specified
-        if try_import(module):
-            if verbose: sys.stderr.write('audio: using %s\n' % (module,))
-        else:
-            msg = 'Failed to import user-specified audio module %s' % (module,)
-            if verbose: sys.stderr.write('audio: %s\n' % (msg,))
-            raise ImportError, msg
-
-__init__()
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py b/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py
index 5e4e06871..62f40582e 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py
@@ -62,9 +62,14 @@ class pfb_arb_resampler_ccf(gr.hier_block2):
                         raise RuntimeError("optfir could not generate an appropriate filter.")
 
         self.pfb = gr.pfb_arb_resampler_ccf(self._rate, self._taps, self._size)
-
+        #print "PFB has %d taps\n" % (len(self._taps),)
+        
         self.connect(self, self.pfb)
         self.connect(self.pfb, self)
-        
+
+    # Note -- set_taps not implemented in base class yet
     def set_taps(self, taps):
         self.pfb.set_taps(taps)
+
+    def set_rate(self, rate):
+        self.pfb.set_rate(rate)
diff --git a/gnuradio-core/src/python/gnuradio/gr/Makefile.am b/gnuradio-core/src/python/gnuradio/gr/Makefile.am
index 341f58812..b8da9cf48 100644
--- a/gnuradio-core/src/python/gnuradio/gr/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/gr/Makefile.am
@@ -21,12 +21,11 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = 			\
+EXTRA_DIST += 			\
 	run_tests.in		\
 	test_16bit_1chunk.wav
 
-TESTS = 			\
-	run_tests
+TESTS = run_tests
 
 
 grgrpythondir = $(grpythondir)/gr
@@ -39,7 +38,6 @@ grgrpython_PYTHON = 		\
 	gr_threading_24.py	\
 	hier_block2.py		\
 	prefs.py		\
-	scheduler.py		\
 	top_block.py		\
 	pubsub.py
 
diff --git a/gnuradio-core/src/python/gnuradio/gr/__init__.py b/gnuradio-core/src/python/gnuradio/gr/__init__.py
index 6f939c470..73ca8e08f 100644
--- a/gnuradio-core/src/python/gnuradio/gr/__init__.py
+++ b/gnuradio-core/src/python/gnuradio/gr/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2003,2004,2006,2008,2009 Free Software Foundation, Inc.
+# Copyright 2003,2004,2006,2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -40,7 +40,7 @@ if _RTLD_GLOBAL != 0:
     _dlopenflags = sys.getdlopenflags()
     sys.setdlopenflags(_dlopenflags|_RTLD_GLOBAL)
 
-from gnuradio_swig_python import *
+from gnuradio_core import *
 from exceptions import *
 from hier_block2 import *
 from top_block import *
diff --git a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py b/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
index b43c5feda..debb65d91 100644
--- a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
+++ b/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio_swig_python import hier_block2_swig
+from gnuradio_core import hier_block2_swig
 
 #
 # This hack forces a 'has-a' relationship to look like an 'is-a' one.
@@ -66,7 +66,7 @@ class hier_block2(object):
             raise ValueError, ("connect requires at least one endpoint; %d provided." % (len (points),))
 	else:
 	    if len(points) == 1:
-		self._hb.connect(points[0].basic_block())
+		self._hb.primitive_connect(points[0].to_basic_block())
 	    else:
 		for i in range (1, len (points)):
         	    self._connect(points[i-1], points[i])
@@ -74,11 +74,11 @@ class hier_block2(object):
     def _connect(self, src, dst):
         (src_block, src_port) = self._coerce_endpoint(src)
         (dst_block, dst_port) = self._coerce_endpoint(dst)
-        self._hb.connect(src_block.basic_block(), src_port,
-                         dst_block.basic_block(), dst_port)
+        self._hb.primitive_connect(src_block.to_basic_block(), src_port,
+                                   dst_block.to_basic_block(), dst_port)
 
     def _coerce_endpoint(self, endp):
-        if hasattr(endp, 'basic_block'):
+        if hasattr(endp, 'to_basic_block'):
             return (endp, 0)
         else:
             if hasattr(endp, "__getitem__") and len(endp) == 2:
@@ -97,10 +97,10 @@ class hier_block2(object):
         """
         
         if len (points) < 1:
-            raise ValueError, ("disconnect requires at least two endpoints; %d provided." % (len (points),))
+            raise ValueError, ("disconnect requires at least one endpoint; %d provided." % (len (points),))
         else:
             if len (points) == 1:
-                self._hb.disconnect(points[0].basic_block())
+                self._hb.primitive_disconnect(points[0].to_basic_block())
             else:
                 for i in range (1, len (points)):
                     self._disconnect(points[i-1], points[i])
@@ -108,6 +108,6 @@ class hier_block2(object):
     def _disconnect(self, src, dst):
         (src_block, src_port) = self._coerce_endpoint(src)
         (dst_block, dst_port) = self._coerce_endpoint(dst)
-        self._hb.disconnect(src_block.basic_block(), src_port,
-                            dst_block.basic_block(), dst_port)
+        self._hb.primitive_disconnect(src_block.to_basic_block(), src_port,
+                                      dst_block.to_basic_block(), dst_port)
 
diff --git a/gnuradio-core/src/python/gnuradio/gr/prefs.py b/gnuradio-core/src/python/gnuradio/gr/prefs.py
index 9b31b772b..40347a2f4 100644
--- a/gnuradio-core/src/python/gnuradio/gr/prefs.py
+++ b/gnuradio-core/src/python/gnuradio/gr/prefs.py
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import gnuradio_swig_python as gsp
+import gnuradio_core as gsp
 _prefs_base = gsp.gr_prefs
 
 
diff --git a/gnuradio-core/src/python/gnuradio/gr/scheduler.py b/gnuradio-core/src/python/gnuradio/gr/scheduler.py
deleted file mode 100644
index 4694d48b2..000000000
--- a/gnuradio-core/src/python/gnuradio/gr/scheduler.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# 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 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.
-# 
-
-from gnuradio.gr.exceptions import *
-from gnuradio_swig_python import single_threaded_scheduler, sts_pyrun
-import gr_threading as _threading
-#import threading as _threading
-
-class scheduler_thread(_threading.Thread):
-    def __init__(self, sts):
-        _threading.Thread.__init__(self)
-        self.sts = sts
-    def run(self):
-        # Invoke the single threaded scheduler's run method
-        #
-        # Note that we're in a new thread, and that sts_pyrun
-        # releases the global interpreter lock.  This has the
-        # effect of evaluating the graph in parallel to the
-        # main line control code.
-        sts_pyrun(self.sts)  
-        self.sts = None
-        
-class scheduler(object):
-    def __init__(self, fg):
-        graphs = fg.partition_graph(fg.blocks)
-        # print "@@@ # graphs = %d" % (len(graphs))
-        
-        self.state = []
-        
-        for g in graphs:
-            list_of_blocks = [x.block() for x in g]
-            sts = single_threaded_scheduler(list_of_blocks)
-            thread = scheduler_thread(sts)
-            thread.setDaemon(1)
-            self.state.append((sts, thread))
-
-    def start(self):
-        for (sts, thread) in self.state:
-            thread.start()
-
-    def stop(self):
-        for (sts, thread) in self.state:
-            sts.stop()
-        self.wait()
-
-    def wait(self):
-        for (sts, thread) in self.state:
-            timeout = 0.100
-            while True:
-                thread.join(timeout)
-                if not thread.isAlive():
-                    break
diff --git a/gnuradio-core/src/python/gnuradio/gr/top_block.py b/gnuradio-core/src/python/gnuradio/gr/top_block.py
index 71e401424..1e36d3b48 100644
--- a/gnuradio-core/src/python/gnuradio/gr/top_block.py
+++ b/gnuradio-core/src/python/gnuradio/gr/top_block.py
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio_swig_python import top_block_swig, \
+from gnuradio_core import top_block_swig, \
     top_block_wait_unlocked, top_block_run_unlocked
 
 #import gnuradio.gr.gr_threading as _threading
@@ -118,7 +118,7 @@ class top_block(object):
             raise ValueError, ("connect requires at least one endpoint; %d provided." % (len (points),))
 	else:
 	    if len(points) == 1:
-		self._tb.connect(points[0].basic_block())
+		self._tb.primitive_connect(points[0].to_basic_block())
 	    else:
 		for i in range (1, len (points)):
         	    self._connect(points[i-1], points[i])
@@ -126,11 +126,11 @@ class top_block(object):
     def _connect(self, src, dst):
         (src_block, src_port) = self._coerce_endpoint(src)
         (dst_block, dst_port) = self._coerce_endpoint(dst)
-        self._tb.connect(src_block.basic_block(), src_port,
-                         dst_block.basic_block(), dst_port)
+        self._tb.primitive_connect(src_block.to_basic_block(), src_port,
+                                   dst_block.to_basic_block(), dst_port)
 
     def _coerce_endpoint(self, endp):
-        if hasattr(endp, 'basic_block'):
+        if hasattr(endp, 'to_basic_block'):
             return (endp, 0)
         else:
             if hasattr(endp, "__getitem__") and len(endp) == 2:
@@ -139,14 +139,14 @@ class top_block(object):
                 raise ValueError("unable to coerce endpoint")
 
     def disconnect(self, *points):
-        '''connect requires one or more arguments that can be coerced to endpoints.
+        '''disconnect requires one or more arguments that can be coerced to endpoints.
         If more than two arguments are provided, they are disconnected successively.
         '''
         if len (points) < 1:
-            raise ValueError, ("disconnect requires at least two endpoints; %d provided." % (len (points),))
+            raise ValueError, ("disconnect requires at least one endpoint; %d provided." % (len (points),))
         else:
             if len(points) == 1:
-                self._tb.disconnect(points[0].basic_block())
+                self._tb.primitive_disconnect(points[0].to_basic_block())
             else:
                 for i in range (1, len (points)):
                     self._disconnect(points[i-1], points[i])
@@ -154,6 +154,6 @@ class top_block(object):
     def _disconnect(self, src, dst):
         (src_block, src_port) = self._coerce_endpoint(src)
         (dst_block, dst_port) = self._coerce_endpoint(dst)
-        self._tb.disconnect(src_block.basic_block(), src_port,
-                            dst_block.basic_block(), dst_port)
+        self._tb.primitive_disconnect(src_block.to_basic_block(), src_port,
+                                      dst_block.to_basic_block(), dst_port)