diff options
| author | Nick Foster | 2011-01-10 15:25:19 -0800 |
|---|---|---|
| committer | Nick Foster | 2011-01-10 15:25:19 -0800 |
| commit | 70e978b7fdc0285b56ed3ec7be3f10dc3d922504 (patch) | |
| tree | 75231113034c1ac75277fbe444c02e9b600b2a7a /usrp/host/include | |
| parent | 0e92b93f21fc9c324c379bc318120d414e7422cc (diff) | |
| parent | bb438e7d12c5767123f8abed5810f284a5f18bf8 (diff) | |
| download | gnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.tar.gz gnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.tar.bz2 gnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.zip | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Diffstat (limited to 'usrp/host/include')
| -rw-r--r-- | usrp/host/include/usrp/Makefile.am | 6 | ||||
| -rw-r--r-- | usrp/host/include/usrp/db_base.i | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/usrp/host/include/usrp/Makefile.am b/usrp/host/include/usrp/Makefile.am index 2aaf66a53..19504313b 100644 --- a/usrp/host/include/usrp/Makefile.am +++ b/usrp/host/include/usrp/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2009 Free Software Foundation, Inc. +# Copyright 2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -47,10 +47,8 @@ usrpinclude_HEADERS = \ usrp_subdev_spec.h \ usrp_tune_result.h -EXTRA_DIST = \ +EXTRA_DIST += \ libusb_types.h.in -if PYTHON swiginclude_HEADERS = \ db_base.i -endif diff --git a/usrp/host/include/usrp/db_base.i b/usrp/host/include/usrp/db_base.i index 78c72b8c3..fdabd4f99 100644 --- a/usrp/host/include/usrp/db_base.i +++ b/usrp/host/include/usrp/db_base.i @@ -91,6 +91,7 @@ typedef boost::shared_ptr<db_base> db_base_sptr; %template(db_base_sptr_vector) std::vector<db_base_sptr>; %template(db_base_sptr_vector_vector) std::vector<std::vector<db_base_sptr> >; +#ifdef SWIGPYTHON // Set better class name in Python // Enable freq_range and gain_range from public methods of class not implemented in C++ // And create a dummy wrapper for backwards compatability with some of the example code @@ -98,5 +99,5 @@ typedef boost::shared_ptr<db_base> db_base_sptr; db_base_sptr.__repr__ = lambda self: "<db_base::%s>" % (self.name(),) db_base_sptr.freq_range = lambda self: (self.freq_min(), self.freq_max(), 1) db_base_sptr.gain_range = lambda self: (self.gain_min(), self.gain_max(), self.gain_db_per_step()) - %} +#endif |