[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into python3

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch python3
in repository gnuradio.

commit c917efc83afe708313d2079b0cf1f3160441b604
Merge: 00a557a cf0d54d
Author: Johnathan Corgan <address@hidden>
Date:   Mon Apr 17 14:12:10 2017 -0700

    Merge branch 'next' into python3

 gr-audio/lib/osx/osx_impl.cc |  2 +-
 gr-uhd/apps/uhd_app.py       | 37 +++++++++++++++++++++----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --cc gr-uhd/apps/uhd_app.py
index de09c2c,7fccf85..a754f01
--- a/gr-uhd/apps/uhd_app.py
+++ b/gr-uhd/apps/uhd_app.py
@@@ -154,31 -157,31 +159,31 @@@ class UHDApp(object)
              )
          )
          # Set the subdevice spec:
-         args.spec = self.normalize_sel("mboards", "subdev",
+         self.spec = self.normalize_sel("mboards", "subdev",
                                         self.usrp.get_num_mboards(), args.spec)
-         if args.spec:
+         if self.spec:
 -            for mb_idx in xrange(self.usrp.get_num_mboards()):
 +            for mb_idx in range(self.usrp.get_num_mboards()):
-                 if len(args.spec) == 1:
-                     self.usrp.set_subdev_spec(args.spec, mb_idx)
+                 if len(self.spec) == 1:
+                     self.usrp.set_subdev_spec(self.spec, mb_idx)
                  else:
-                     self.usrp.set_subdev_spec(args.spec[mb_idx], mb_idx)
+                     self.usrp.set_subdev_spec(self.spec[mb_idx], mb_idx)
          # Set the clock and/or time source:
          if args.clock_source is not None:
-             args.clock_source = self.normalize_sel("mboards", "clock-source",
+             self.clock_source = self.normalize_sel("mboards", "clock-source",
                                                     
self.usrp.get_num_mboards(), args.clock_source)
 -            for mb_idx in xrange(self.usrp.get_num_mboards()):
 +            for mb_idx in range(self.usrp.get_num_mboards()):
-                 if len(args.time_source) == 1:
-                     self.usrp.set_clock_source(args.clock_source[0], mb_idx)
+                 if len(self.clock_source) == 1:
+                     self.usrp.set_clock_source(self.clock_source[0], mb_idx)
                  else:
-                     self.usrp.set_clock_source(args.clock_source[mb_idx], 
mb_idx)
+                     self.usrp.set_clock_source(self.clock_source[mb_idx], 
mb_idx)
          if args.time_source is not None:
-             args.time_source = self.normalize_sel("mboards", "time-source",
+             self.time_source = self.normalize_sel("mboards", "time-source",
                                                    
self.usrp.get_num_mboards(), args.time_source)
 -            for mb_idx in xrange(self.usrp.get_num_mboards()):
 +            for mb_idx in range(self.usrp.get_num_mboards()):
-                 if len(args.time_source) == 1:
-                     self.usrp.set_time_source(args.time_source[0], mb_idx)
+                 if len(self.time_source) == 1:
+                     self.usrp.set_time_source(self.time_source[0], mb_idx)
                  else:
-                     self.usrp.set_time_source(args.time_source[mb_idx], 
mb_idx)
+                     self.usrp.set_time_source(self.time_source[mb_idx], 
mb_idx)
          # Sampling rate:
          self.usrp.set_samp_rate(args.samp_rate)
          self.samp_rate = self.usrp.get_samp_rate()