3 files changed, 19 insertions, 21 deletions

diff --git a/gr-uhd/lib/uhd_single_usrp_sink.cc b/gr-uhd/lib/uhd_single_usrp_sink.cc
index 622f506b5..a38bd05d6 100644
--- a/gr-uhd/lib/uhd_single_usrp_sink.cc
+++ b/gr-uhd/lib/uhd_single_usrp_sink.cc
@@ -63,40 +63,40 @@ public:
     }
 
     uhd::tune_result_t set_center_freq(
-        const uhd::tune_request_t tune_request, size_t chan
+        const uhd::tune_request_t tune_request, size_t chan = 0
     ){
         return _dev->set_tx_freq(tune_request, chan);
     }
 
-    uhd::freq_range_t get_freq_range(size_t chan){
+    uhd::freq_range_t get_freq_range(size_t chan = 0){
         return _dev->get_tx_freq_range(chan);
     }
 
-    void set_gain(float gain, size_t chan){
+    void set_gain(float gain, size_t chan = 0){
         return _dev->set_tx_gain(gain, chan);
     }
 
-    float get_gain(size_t chan){
+    float get_gain(size_t chan = 0){
         return _dev->get_tx_gain(chan);
     }
 
-    uhd::gain_range_t get_gain_range(size_t chan){
+    uhd::gain_range_t get_gain_range(size_t chan = 0){
         return _dev->get_tx_gain_range(chan);
     }
 
-    void set_antenna(const std::string &ant, size_t chan){
+    void set_antenna(const std::string &ant, size_t chan = 0){
         return _dev->set_tx_antenna(ant, chan);
     }
 
-    std::string get_antenna(size_t chan){
+    std::string get_antenna(size_t chan = 0){
         return _dev->get_tx_antenna(chan);
     }
 
-    std::vector<std::string> get_antennas(size_t chan){
+    std::vector<std::string> get_antennas(size_t chan = 0){
         return _dev->get_tx_antennas(chan);
     }
 
-    void set_bandwidth(double bandwidth, size_t chan){
+    void set_bandwidth(double bandwidth, size_t chan = 0){
         return _dev->set_tx_bandwidth(bandwidth, chan);
     }
 
diff --git a/gr-uhd/lib/uhd_single_usrp_source.cc b/gr-uhd/lib/uhd_single_usrp_source.cc
index c33c8c0b0..ac8cd07fc 100644
--- a/gr-uhd/lib/uhd_single_usrp_source.cc
+++ b/gr-uhd/lib/uhd_single_usrp_source.cc
@@ -69,40 +69,40 @@ public:
     }
 
     uhd::tune_result_t set_center_freq(
-        const uhd::tune_request_t tune_request, size_t chan
+        const uhd::tune_request_t tune_request, size_t chan = 0
     ){
         return _dev->set_rx_freq(tune_request, chan);
     }
 
-    uhd::freq_range_t get_freq_range(size_t chan){
+    uhd::freq_range_t get_freq_range(size_t chan = 0){
         return _dev->get_rx_freq_range(chan);
     }
 
-    void set_gain(float gain, size_t chan){
+    void set_gain(float gain, size_t chan = 0){
         return _dev->set_rx_gain(gain, chan);
     }
 
-    float get_gain(size_t chan){
+    float get_gain(size_t chan = 0){
         return _dev->get_rx_gain(chan);
     }
 
-    uhd::gain_range_t get_gain_range(size_t chan){
+    uhd::gain_range_t get_gain_range(size_t chan = 0){
         return _dev->get_rx_gain_range(chan);
     }
 
-    void set_antenna(const std::string &ant, size_t chan){
+    void set_antenna(const std::string &ant, size_t chan = 0){
         return _dev->set_rx_antenna(ant, chan);
     }
 
-    std::string get_antenna(size_t chan){
+    std::string get_antenna(size_t chan = 0){
         return _dev->get_rx_antenna(chan);
     }
 
-    std::vector<std::string> get_antennas(size_t chan){
+    std::vector<std::string> get_antennas(size_t chan = 0){
         return _dev->get_rx_antennas(chan);
     }
 
-    void set_bandwidth(double bandwidth, size_t chan){
+    void set_bandwidth(double bandwidth, size_t chan = 0){
         return _dev->set_rx_bandwidth(bandwidth, chan);
     }
 
diff --git a/gr-uhd/swig/Makefile.am b/gr-uhd/swig/Makefile.am
index fd496fc7b..9eb3eab11 100644
--- a/gr-uhd/swig/Makefile.am
+++ b/gr-uhd/swig/Makefile.am
@@ -56,9 +56,7 @@ uhd_swig_swiginclude_headers =
 include $(top_srcdir)/Makefile.swig
 
 # FIXME better way to set this?
-STD_SWIG_PYTHON_ARGS += \
-	$(UHD_CFLAGS) \
-	-I$(top_srcdir)/gr-uhd/lib
+STD_SWIG_PYTHON_ARGS += $(UHD_CFLAGS)
 
 # add some of the variables generated inside the Makefile.swig.gen
 BUILT_SOURCES = $(swig_built_sources)