Merge remote-tracking branch 'jblum/uhd_next'

2 files changed, 24 insertions, 3 deletions

diff --git a/gr-uhd/swig/__init__.py b/gr-uhd/swig/__init__.py
index 7745b4b79..d098a7b8a 100644
--- a/gr-uhd/swig/__init__.py
+++ b/gr-uhd/swig/__init__.py
@@ -57,6 +57,20 @@ def _prepare_uhd_swig():
         def __setitem__(self, key, val): self.set(key, val)
     setattr(uhd_swig, 'device_addr_t', device_addr_t)
 
+    #make the streamer args take **kwargs on init
+    class stream_args_t(uhd_swig.stream_args_t):
+        def __init__(self, *args, **kwargs):
+            super(stream_args_t, self).__init__(*args)
+            for key, val in kwargs.iteritems():
+                #for some reason, i cant assign a list in the constructor
+                #but what i can do is append the elements individually
+                if key == 'channels':
+                    for v in val: self.channels.append(v)
+                elif key == 'args':
+                    self.args = device_addr_t(val)
+                else: setattr(self, key, val)
+    setattr(uhd_swig, 'stream_args_t', stream_args_t)
+
     #handle general things on all uhd_swig attributes
     #Install the __str__ and __repr__ handlers if applicable
     #Create aliases for uhd swig attributes to avoid the "_t"
@@ -88,9 +102,14 @@ def _prepare_uhd_swig():
                     (0, 'device_addr', device_addr),
                     (1, 'io_type', io_type),
                 ):
-                    if len(args) > index: args[index] = cast(args[index])
-                    if kwargs.has_key(key): kwargs[key] = cast(kwargs[key])
-                return old_constructor(*args, **kwargs)
+                    try:
+                        if len(args) > index: args[index] = cast(args[index])
+                        if kwargs.has_key(key): kwargs[key] = cast(kwargs[key])
+                    except: pass
+                #dont pass kwargs, it confuses swig, map into args list:
+                for key in ('device_addr', 'stream_args', 'io_type', 'num_channels'):
+                    if kwargs.has_key(key): args.append(kwargs[key])
+                return old_constructor(*args)
             return constructor_interceptor
         setattr(uhd_swig, attr, constructor_factory(getattr(uhd_swig, attr)))
 
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i
index 7e612907c..6ff9d9843 100644
--- a/gr-uhd/swig/uhd_swig.i
+++ b/gr-uhd/swig/uhd_swig.i
@@ -48,6 +48,8 @@
 ////////////////////////////////////////////////////////////////////////
 %template(string_vector_t) std::vector<std::string>;
 
+%template(size_vector_t) std::vector<size_t>;
+
 %include <uhd/config.hpp>
 
 %include <uhd/utils/pimpl.hpp>