Merge branch 'master' into next

author: Johnathan Corgan <johnathan@corganlabs.com> 2016-06-28 11:39:32 -0700
committer: Johnathan Corgan <johnathan@corganlabs.com> 2016-06-28 11:39:32 -0700
commit: 229dbd0aab5f2ef6819773f79eb17cdc8f27773a (patch)
tree: b81361d68eebbf7fbeecb435d88f9750a47b872f
parent: 45cbe43da3317d9c872672553185d36c5cdf59bd (diff)
parent: e8e6ab08a7f943db17666bef4c49f8a4aef3b60f (diff)
26 files changed, 51 insertions, 85 deletions
diff --git a/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py b/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py
index 7cf3210b0e..1a43dc3a11 100755
--- a/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py
+++ b/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py
@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gru, eng_notation, optfir
+from gnuradio import gr, gru, eng_notation, filter
 from gnuradio import audio
 from gnuradio import analog
 from gnuradio import blocks
@@ -61,7 +61,7 @@ class wfm_rx_block (gr.top_block):
         audio_rate = demod_rate / audio_decimation  # 32 kHz
 
 
-        chan_filt_coeffs = optfir.low_pass (1,           # gain
+        chan_filt_coeffs = filter.optfir.low_pass (1,    # gain
                                             usrp_rate,   # sampling rate
                                             80e3,        # passband cutoff
                                             115e3,       # stopband cutoff
diff --git a/gnuradio-runtime/examples/network/audio_source.py b/gnuradio-runtime/examples/network/audio_source.py
index 577beff84c..881efff81a 100755
--- a/gnuradio-runtime/examples/network/audio_source.py
+++ b/gnuradio-runtime/examples/network/audio_source.py
@@ -41,7 +41,7 @@ class audio_source(gr.top_block):
 
 if __name__ == '__main__':
     parser = OptionParser(option_class=eng_option)
-    parser.add_option("", "--host", type="string", default="localhost",
+    parser.add_option("", "--host", type="string", default="127.0.0.1",
                       help="Remote host name (domain name or IP address")
     parser.add_option("", "--port", type="int", default=65500,
                       help="port number to connect to")
diff --git a/gnuradio-runtime/examples/network/dial_tone_source.py b/gnuradio-runtime/examples/network/dial_tone_source.py
index 26064962dd..20c9a3b800 100755
--- a/gnuradio-runtime/examples/network/dial_tone_source.py
+++ b/gnuradio-runtime/examples/network/dial_tone_source.py
@@ -53,7 +53,7 @@ class dial_tone_source(gr.top_block):
 
 if __name__ == '__main__':
     parser = OptionParser(option_class=eng_option)
-    parser.add_option("", "--host", type="string", default="localhost",
+    parser.add_option("", "--host", type="string", default="127.0.0.1",
                       help="Remote host name (domain name or IP address")
     parser.add_option("", "--port", type="int", default=65500,
                       help="port number to connect to")
diff --git a/gnuradio-runtime/examples/network/vector_source.py b/gnuradio-runtime/examples/network/vector_source.py
index 568425fd50..c13b4b1d6f 100755
--- a/gnuradio-runtime/examples/network/vector_source.py
+++ b/gnuradio-runtime/examples/network/vector_source.py
@@ -35,7 +35,7 @@ class vector_source(gr.top_block):
 
 if __name__ == '__main__':
     parser = OptionParser(option_class=eng_option)
-    parser.add_option("", "--host", type="string", default="localhost",
+    parser.add_option("", "--host", type="string", default="127.0.0.1",
                       help="Remote host name (domain name or IP address")
     parser.add_option("", "--port", type="int", default=65500,
                       help="port number to connect to")
diff --git a/gr-digital/examples/narrowband/benchmark_add_channel.py b/gr-digital/examples/narrowband/benchmark_add_channel.py
index b614895b63..cd85f4e488 100755
--- a/gr-digital/examples/narrowband/benchmark_add_channel.py
+++ b/gr-digital/examples/narrowband/benchmark_add_channel.py
@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, filter
+from gnuradio import channels, gr
 from gnuradio import blocks
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
@@ -45,7 +45,7 @@ class my_top_block(gr.top_block):
         self.src = blocks.file_source(gr.sizeof_gr_complex, ifile)
         #self.throttle = blocks.throttle(gr.sizeof_gr_complex, options.sample_rate)
 
-        self.channel = filter.channel_model(noise_voltage, frequency_offset,
+        self.channel = channels.channel_model(noise_voltage, frequency_offset,
                                             time_offset, noise_seed=-random.randint(0,100000))
         self.phase = blocks.multiply_const_cc(complex(math.cos(phase_offset),
                                                   math.sin(phase_offset)))
diff --git a/gr-digital/examples/narrowband/receive_path.py b/gr-digital/examples/narrowband/receive_path.py
index dc155e1d12..8bbfe92770 100644
--- a/gr-digital/examples/narrowband/receive_path.py
+++ b/gr-digital/examples/narrowband/receive_path.py
@@ -124,8 +124,8 @@ class receive_path(gr.hier_block2):
             threshold_in_db: set detection threshold (float (dB))
         """
         self.probe.set_threshold(threshold_in_db)
-    
-        
+
+    @staticmethod
     def add_options(normal, expert):
         """
         Adds receiver-specific options to the Options Parser
@@ -141,10 +141,6 @@ class receive_path(gr.hier_block2):
         expert.add_option("", "--chbw-factor", type="float", default=1.0,
                           help="Channel bandwidth = chbw_factor x signal bandwidth [defaut=%default]")
 
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
-
     def _print_verbage(self):
         """
         Prints information about the receive path
diff --git a/gr-digital/examples/narrowband/transmit_path.py b/gr-digital/examples/narrowband/transmit_path.py
index 43a96050e9..70b4044e52 100644
--- a/gr-digital/examples/narrowband/transmit_path.py
+++ b/gr-digital/examples/narrowband/transmit_path.py
@@ -94,6 +94,7 @@ class transmit_path(gr.hier_block2):
     def differential(self):
         return self.modulator._differential
 
+    @staticmethod
     def add_options(normal, expert):
         """
         Adds transmitter-specific options to the Options Parser
@@ -115,9 +116,6 @@ class transmit_path(gr.hier_block2):
                           default=False,
                           help="Log all parts of flow graph to file (CAUTION: lots of data)")
 
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
     def _print_verbage(self):
         """
         Prints information about the transmit path
diff --git a/gr-digital/examples/narrowband/uhd_interface.py b/gr-digital/examples/narrowband/uhd_interface.py
index 474e96f486..e7c7fe3af0 100644
--- a/gr-digital/examples/narrowband/uhd_interface.py
+++ b/gr-digital/examples/narrowband/uhd_interface.py
@@ -145,7 +145,8 @@ class uhd_transmitter(uhd_interface, gr.hier_block2):
 
         if(verbose):
             self._print_verbage()
-            
+
+    @staticmethod
     def add_options(parser):
         add_freq_option(parser)
         parser.add_option("-a", "--args", type="string", default="",
@@ -165,9 +166,6 @@ class uhd_transmitter(uhd_interface, gr.hier_block2):
                           help="select clock source (e.g. 'external') [default=%default]") 
         parser.add_option("-v", "--verbose", action="store_true", default=False)
 
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
     def _print_verbage(self):
         """
         Prints information about the UHD transmitter
@@ -203,6 +201,7 @@ class uhd_receiver(uhd_interface, gr.hier_block2):
         if(verbose):
             self._print_verbage()
 
+    @staticmethod
     def add_options(parser):
         add_freq_option(parser)
         parser.add_option("-a", "--args", type="string", default="",
@@ -223,9 +222,6 @@ class uhd_receiver(uhd_interface, gr.hier_block2):
         if not parser.has_option("--verbose"):
             parser.add_option("-v", "--verbose", action="store_true", default=False)
 
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
     def _print_verbage(self):
         """
         Prints information about the UHD transmitter
diff --git a/gr-digital/examples/ofdm/benchmark_add_channel.py b/gr-digital/examples/ofdm/benchmark_add_channel.py
index f97214f78d..0ac46985a7 100755
--- a/gr-digital/examples/ofdm/benchmark_add_channel.py
+++ b/gr-digital/examples/ofdm/benchmark_add_channel.py
@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, filter
+from gnuradio import gr, channels
 from gnuradio import blocks
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
@@ -47,7 +47,7 @@ class my_top_block(gr.top_block):
         self.src = blocks.file_source(gr.sizeof_gr_complex, ifile)
         #self.throttle = blocks.throttle(gr.sizeof_gr_complex, options.sample_rate)
 
-        self.channel = filter.channel_model(noise_voltage, frequency_offset,
+        self.channel = channels.channel_model(noise_voltage, frequency_offset,
                                         time_offset, noise_seed=-random.randint(0,100000))
         self.phase = blocks.multiply_const_cc(complex(math.cos(phase_offset),
                                                   math.sin(phase_offset)))
diff --git a/gr-digital/examples/ofdm/receive_path.py b/gr-digital/examples/ofdm/receive_path.py
index 2a6813f8f9..0cb4479a2e 100644
--- a/gr-digital/examples/ofdm/receive_path.py
+++ b/gr-digital/examples/ofdm/receive_path.py
@@ -82,8 +82,8 @@ class receive_path(gr.hier_block2):
             threshold_in_db: set detection threshold (float (dB))
         """
         self.probe.set_threshold(threshold_in_db)
-    
-        
+
+    @staticmethod
     def add_options(normal, expert):
         """
         Adds receiver-specific options to the Options Parser
@@ -95,10 +95,6 @@ class receive_path(gr.hier_block2):
         expert.add_option("", "--log", action="store_true", default=False,
                           help="Log all parts of flow graph to files (CAUTION: lots of data)")
 
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
-
     def _print_verbage(self):
         """
         Prints information about the receive path
diff --git a/gr-digital/examples/ofdm/transmit_path.py b/gr-digital/examples/ofdm/transmit_path.py
index aa146cea96..98a81f3c1a 100644
--- a/gr-digital/examples/ofdm/transmit_path.py
+++ b/gr-digital/examples/ofdm/transmit_path.py
@@ -75,7 +75,8 @@ class transmit_path(gr.hier_block2):
         Calls the transmitter method to send a packet
         """
         return self.ofdm_tx.send_pkt(payload, eof)
-        
+
+    @staticmethod
     def add_options(normal, expert):
         """
         Adds transmitter-specific options to the Options Parser
@@ -92,9 +93,6 @@ class transmit_path(gr.hier_block2):
                           default=False,
                           help="Log all parts of flow graph to file (CAUTION: lots of data)")
 
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
     def _print_verbage(self):
         """
         Prints information about the transmit path
diff --git a/gr-digital/examples/ofdm/uhd_interface.py b/gr-digital/examples/ofdm/uhd_interface.py
index 5b4d707b07..ac34d956ae 100644
--- a/gr-digital/examples/ofdm/uhd_interface.py
+++ b/gr-digital/examples/ofdm/uhd_interface.py
@@ -126,7 +126,8 @@ class uhd_transmitter(uhd_interface, gr.hier_block2):
 
         if(verbose):
             self._print_verbage()
-            
+
+    @staticmethod
     def add_options(parser):
         add_freq_option(parser)
         parser.add_option("-a", "--args", type="string", default="",
@@ -146,9 +147,6 @@ class uhd_transmitter(uhd_interface, gr.hier_block2):
                           help="select clock source (e.g. 'external') [default=%default]")
         parser.add_option("-v", "--verbose", action="store_true", default=False)
 
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
     def _print_verbage(self):
         """
         Prints information about the UHD transmitter
@@ -186,6 +184,7 @@ class uhd_receiver(uhd_interface, gr.hier_block2):
         if(verbose):
             self._print_verbage()
 
+    @staticmethod
     def add_options(parser):
         add_freq_option(parser)
         parser.add_option("-a", "--args", type="string", default="",
@@ -206,9 +205,6 @@ class uhd_receiver(uhd_interface, gr.hier_block2):
         if not parser.has_option("--verbose"):
             parser.add_option("-v", "--verbose", action="store_true", default=False)
 
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
     def _print_verbage(self):
         """
         Prints information about the UHD transmitter
diff --git a/gr-digital/python/digital/cpm.py b/gr-digital/python/digital/cpm.py
index b27fb098f5..322c3f0bfc 100644
--- a/gr-digital/python/digital/cpm.py
+++ b/gr-digital/python/digital/cpm.py
@@ -204,23 +204,21 @@ class cpm_mod(gr.hier_block2):
         self.connect(self.fmmod,
                      blocks.file_sink(gr.sizeof_gr_complex, "fmmod.dat"))
 
-
+    @staticmethod
     def add_options(parser):
         """
         Adds CPM modulation-specific options to the standard parser
         """
         parser.add_option("", "--bt", type="float", default=_def_bt,
                           help="set bandwidth-time product [default=%default] (GMSK)")
-    add_options=staticmethod(add_options)
-
 
+    @staticmethod
     def extract_kwargs_from_options(options):
         """
         Given command line options, create dictionary suitable for passing to __init__
         """
         return modulation_utils.extract_kwargs_from_options(cpm_mod.__init__,
                                                              ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
 
 
 
diff --git a/gr-digital/python/digital/generic_mod_demod.py b/gr-digital/python/digital/generic_mod_demod.py
index f34994fa7b..1b8e1149c9 100644
--- a/gr-digital/python/digital/generic_mod_demod.py
+++ b/gr-digital/python/digital/generic_mod_demod.py
@@ -175,12 +175,12 @@ class generic_mod(gr.hier_block2):
     def bits_per_symbol(self):   # static method that's also callable on an instance
         return self._constellation.bits_per_symbol()
 
+    @staticmethod
     def add_options(parser):
         """
         Adds generic modulation options to the standard parser
         """
         add_common_options(parser)
-    add_options=staticmethod(add_options)
 
     def extract_kwargs_from_options(cls, options):
         """
@@ -324,7 +324,7 @@ class generic_demod(gr.hier_block2):
     def samples_per_symbol(self):
         return self._samples_per_symbol
 
-    def bits_per_symbol(self):   # staticmethod that's also callable on an instance
+    def bits_per_symbol(self):
         return self._constellation.bits_per_symbol()
 
     def _print_verbage(self):
@@ -372,6 +372,7 @@ class generic_demod(gr.hier_block2):
         self.connect(self.unpack,
                      blocks.file_sink(gr.sizeof_char, "rx_unpack.8b"))
 
+    @staticmethod
     def add_options(parser):
         """
         Adds generic demodulation options to the standard parser
@@ -385,7 +386,6 @@ class generic_demod(gr.hier_block2):
                           help="set phase tracking loop lock-in bandwidth [default=%default]")
         parser.add_option("", "--timing-bw", type="float", default=_def_timing_bw,
                           help="set timing symbol sync loop gain lock-in bandwidth [default=%default]")
-    add_options=staticmethod(add_options)
 
     def extract_kwargs_from_options(cls, options):
         """
diff --git a/gr-digital/python/digital/gfsk.py b/gr-digital/python/digital/gfsk.py
index 6ba007ca0f..3569ffe6cf 100644
--- a/gr-digital/python/digital/gfsk.py
+++ b/gr-digital/python/digital/gfsk.py
@@ -133,10 +133,9 @@ class gfsk_mod(gr.hier_block2):
     def samples_per_symbol(self):
         return self._samples_per_symbol
 
+    @staticmethod
     def bits_per_symbol(self=None):     # staticmethod that's also callable on an instance
         return 1
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.
-
 
     def _print_verbage(self):
         print "bits per symbol = %d" % self.bits_per_symbol()
@@ -152,24 +151,21 @@ class gfsk_mod(gr.hier_block2):
         self.connect(self.fmmod,
                      blocks.file_sink(gr.sizeof_gr_complex, "fmmod.dat"))
 
-
+    @staticmethod
     def add_options(parser):
         """
         Adds GFSK modulation-specific options to the standard parser
         """
         parser.add_option("", "--bt", type="float", default=_def_bt,
                           help="set bandwidth-time product [default=%default] (GFSK)")
-    add_options=staticmethod(add_options)
-
 
+    @staticmethod
     def extract_kwargs_from_options(options):
         """
         Given command line options, create dictionary suitable for passing to __init__
         """
         return modulation_utils.extract_kwargs_from_options(gfsk_mod.__init__,
                                                             ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
 
 
 # /////////////////////////////////////////////////////////////////////////////
@@ -255,10 +251,9 @@ class gfsk_demod(gr.hier_block2):
     def samples_per_symbol(self):
         return self._samples_per_symbol
 
+    @staticmethod
     def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
         return 1
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.
-
 
     def _print_verbage(self):
         print "bits per symbol = %d" % self.bits_per_symbol()
@@ -278,6 +273,7 @@ class gfsk_demod(gr.hier_block2):
         self.connect(self.slicer,
                     blocks.file_sink(gr.sizeof_char, "slicer.dat"))
 
+    @staticmethod
     def add_options(parser):
         """
         Adds GFSK demodulation-specific options to the standard parser
@@ -290,15 +286,14 @@ class gfsk_demod(gr.hier_block2):
                           help="M&M clock recovery omega relative limit [default=%default] (GFSK/PSK)")
         parser.add_option("", "--freq-error", type="float", default=_def_freq_error,
                           help="M&M clock recovery frequency error [default=%default] (GFSK)")
-    add_options=staticmethod(add_options)
 
+    @staticmethod
     def extract_kwargs_from_options(options):
         """
         Given command line options, create dictionary suitable for passing to __init__
         """
         return modulation_utils.extract_kwargs_from_options(gfsk_demod.__init__,
                                                             ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
 
 
 #
diff --git a/gr-digital/python/digital/gmsk.py b/gr-digital/python/digital/gmsk.py
index 284f85f333..e7a92a95db 100644
--- a/gr-digital/python/digital/gmsk.py
+++ b/gr-digital/python/digital/gmsk.py
@@ -123,10 +123,9 @@ class gmsk_mod(gr.hier_block2):
     def samples_per_symbol(self):
         return self._samples_per_symbol
 
+    @staticmethod
     def bits_per_symbol(self=None):     # staticmethod that's also callable on an instance
         return 1
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.
-
 
     def _print_verbage(self):
         print "bits per symbol = %d" % self.bits_per_symbol()
@@ -142,24 +141,21 @@ class gmsk_mod(gr.hier_block2):
         self.connect(self.fmmod,
                      blocks.file_sink(gr.sizeof_gr_complex, "fmmod.dat"))
 
-
+    @staticmethod
     def add_options(parser):
         """
         Adds GMSK modulation-specific options to the standard parser
         """
         parser.add_option("", "--bt", type="float", default=_def_bt,
                           help="set bandwidth-time product [default=%default] (GMSK)")
-    add_options=staticmethod(add_options)
-
 
+    @staticmethod
     def extract_kwargs_from_options(options):
         """
         Given command line options, create dictionary suitable for passing to __init__
         """
         return modulation_utils.extract_kwargs_from_options(gmsk_mod.__init__,
                                                             ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
 
 
 # /////////////////////////////////////////////////////////////////////////////
@@ -239,10 +235,9 @@ class gmsk_demod(gr.hier_block2):
     def samples_per_symbol(self):
         return self._samples_per_symbol
 
+    @staticmethod
     def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
         return 1
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.
-
 
     def _print_verbage(self):
         print "bits per symbol = %d" % self.bits_per_symbol()
@@ -262,6 +257,7 @@ class gmsk_demod(gr.hier_block2):
         self.connect(self.slicer,
                     blocks.file_sink(gr.sizeof_char, "slicer.dat"))
 
+    @staticmethod
     def add_options(parser):
         """
         Adds GMSK demodulation-specific options to the standard parser
@@ -274,15 +270,14 @@ class gmsk_demod(gr.hier_block2):
                           help="M&M clock recovery omega relative limit [default=%default] (GMSK/PSK)")
         parser.add_option("", "--freq-error", type="float", default=_def_freq_error,
                           help="M&M clock recovery frequency error [default=%default] (GMSK)")
-    add_options=staticmethod(add_options)
 
+    @staticmethod
     def extract_kwargs_from_options(options):
         """
         Given command line options, create dictionary suitable for passing to __init__
         """
         return modulation_utils.extract_kwargs_from_options(gmsk_demod.__init__,
                                                             ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
 
 
 #
diff --git a/gr-digital/python/digital/ofdm.py b/gr-digital/python/digital/ofdm.py
index fdb23703f9..563b70ad00 100644
--- a/gr-digital/python/digital/ofdm.py
+++ b/gr-digital/python/digital/ofdm.py
@@ -146,6 +146,7 @@ class ofdm_mod(gr.hier_block2):
             msg = gr.message_from_string(pkt)
         self._pkt_input.msgq().insert_tail(msg)
 
+    @staticmethod
     def add_options(normal, expert):
         """
         Adds OFDM-specific options to the Options Parser
@@ -158,8 +159,6 @@ class ofdm_mod(gr.hier_block2):
                           help="set the number of occupied FFT bins [default=%default]")
         expert.add_option("", "--cp-length", type="intx", default=128,
                           help="set the number of bits in the cyclic prefix [default=%default]")
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
 
     def _print_verbage(self):
         """
@@ -267,6 +266,7 @@ class ofdm_demod(gr.hier_block2):
             
         self._watcher = _queue_watcher_thread(self._rcvd_pktq, callback)
 
+    @staticmethod
     def add_options(normal, expert):
         """
         Adds OFDM-specific options to the Options Parser
@@ -281,8 +281,6 @@ class ofdm_demod(gr.hier_block2):
                           help="set the number of bits in the cyclic prefix [default=%default]")
         expert.add_option("", "--snr", type="float", default=30.0,
                           help="SNR estimate [default=%default]")
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
 
     def _print_verbage(self):
         """
diff --git a/gr-uhd/apps/hf_radio/input.py b/gr-uhd/apps/hf_radio/input.py
index fd2ac47a5c..49df347e8b 100644
--- a/gr-uhd/apps/hf_radio/input.py
+++ b/gr-uhd/apps/hf_radio/input.py
@@ -65,6 +65,7 @@ class uhd_input(gr.hier_block2):
         self.gain = gain
         self.src.set_gain(gain, 0)
 
+    @staticmethod
     def add_options(parser):
         parser.add_option("-a", "--address", type="string",
                           default="addr=192.168.10.2",
@@ -75,4 +76,3 @@ class uhd_input(gr.hier_block2):
                           help="set frequency to FREQ", metavar="FREQ")
         parser.add_option("-g", "--gain", type="eng_float", default=None,
                           help="set gain in dB (default is midpoint)")
-    add_options = staticmethod(add_options)
diff --git a/gr-uhd/apps/hf_radio/radio.py b/gr-uhd/apps/hf_radio/radio.py
index bbe2bfddb6..970ec01a38 100755
--- a/gr-uhd/apps/hf_radio/radio.py
+++ b/gr-uhd/apps/hf_radio/radio.py
@@ -31,7 +31,7 @@ import wx
 import wx.lib.evtmgr as em
 import time
 
-from gnuradio import gr, gru, eng_notation, optfir
+from gnuradio import gr, gru, eng_notation
 from gnuradio import audio
 from gnuradio import blocks
 from gnuradio import uhd
diff --git a/gr-zeromq/lib/base_impl.cc b/gr-zeromq/lib/base_impl.cc
index f41e5cbfb5..f33315dd40 100644
--- a/gr-zeromq/lib/base_impl.cc
+++ b/gr-zeromq/lib/base_impl.cc
@@ -159,7 +159,7 @@ namespace gr {
     base_source_impl::load_message(bool wait)
     {
       /* Poll for input */
-      zmq::pollitem_t items[] = { { *d_socket, 0, ZMQ_POLLIN, 0 } };
+      zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, ZMQ_POLLIN, 0 } };
       zmq::poll(&items[0], 1, wait ? d_timeout : 0);
 
       if (!(items[0].revents & ZMQ_POLLIN))
diff --git a/gr-zeromq/lib/pull_msg_source_impl.cc b/gr-zeromq/lib/pull_msg_source_impl.cc
index 9d00cdfd74..bd84c9f31a 100644
--- a/gr-zeromq/lib/pull_msg_source_impl.cc
+++ b/gr-zeromq/lib/pull_msg_source_impl.cc
@@ -88,7 +88,7 @@ namespace gr {
     {
       while(!d_finished){
 
-        zmq::pollitem_t items[] = { { *d_socket, 0, ZMQ_POLLIN, 0 } };
+        zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, ZMQ_POLLIN, 0 } };
         zmq::poll (&items[0], 1, d_timeout);
 
         //  If we got a reply, process
diff --git a/gr-zeromq/lib/push_sink_impl.cc b/gr-zeromq/lib/push_sink_impl.cc
index a5aec2cf80..5f9670e4ca 100644
--- a/gr-zeromq/lib/push_sink_impl.cc
+++ b/gr-zeromq/lib/push_sink_impl.cc
@@ -53,7 +53,7 @@ namespace gr {
                          gr_vector_void_star &output_items)
     {
       // Poll with a timeout (FIXME: scheduler can't wait for us)
-      zmq::pollitem_t itemsout[] = { { *d_socket, 0, ZMQ_POLLOUT, 0 } };
+      zmq::pollitem_t itemsout[] = { { static_cast<void *>(*d_socket), 0, ZMQ_POLLOUT, 0 } };
       zmq::poll(&itemsout[0], 1, d_timeout);
 
       // If we can send something, do it
diff --git a/gr-zeromq/lib/rep_msg_sink_impl.cc b/gr-zeromq/lib/rep_msg_sink_impl.cc
index be86f83202..b88e62b3bc 100644
--- a/gr-zeromq/lib/rep_msg_sink_impl.cc
+++ b/gr-zeromq/lib/rep_msg_sink_impl.cc
@@ -90,7 +90,7 @@ namespace gr {
         while(!empty_p(pmt::mp("in"))) {
 
           // wait for query...
-          zmq::pollitem_t items[] = { { *d_socket, 0, ZMQ_POLLIN, 0 } };
+          zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, ZMQ_POLLIN, 0 } };
           zmq::poll (&items[0], 1, d_timeout);
 
           //  If we got a reply, process
diff --git a/gr-zeromq/lib/rep_sink_impl.cc b/gr-zeromq/lib/rep_sink_impl.cc
index ac6fc9c8b1..0303f65db4 100644
--- a/gr-zeromq/lib/rep_sink_impl.cc
+++ b/gr-zeromq/lib/rep_sink_impl.cc
@@ -62,7 +62,7 @@ namespace gr {
         /* Wait for a small time (FIXME: scheduler can't wait for us) */
           /* We only wait if its the first iteration, for the others we'll
            * let the scheduler retry */
-        zmq::pollitem_t items[] = { { *d_socket, 0, ZMQ_POLLIN, 0 } };
+        zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, ZMQ_POLLIN, 0 } };
         zmq::poll(&items[0], 1, first ? d_timeout : 0);
 
           /* If we dont have anything, we're done */
diff --git a/gr-zeromq/lib/req_msg_source_impl.cc b/gr-zeromq/lib/req_msg_source_impl.cc
index e231a31962..7d9f0f38c9 100644
--- a/gr-zeromq/lib/req_msg_source_impl.cc
+++ b/gr-zeromq/lib/req_msg_source_impl.cc
@@ -89,7 +89,7 @@ namespace gr {
       while(!d_finished){
         //std::cout << "readloop\n";
 
-        zmq::pollitem_t itemsout[] = { { *d_socket, 0, ZMQ_POLLOUT, 0 } };
+        zmq::pollitem_t itemsout[] = { { static_cast<void *>(*d_socket), 0, ZMQ_POLLOUT, 0 } };
         zmq::poll(&itemsout[0], 1, d_timeout);
 
         //  If we got a reply, process
@@ -101,7 +101,7 @@ namespace gr {
           d_socket->send(request);
         }
 
-        zmq::pollitem_t items[] = { { *d_socket, 0, ZMQ_POLLIN, 0 } };
+        zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, ZMQ_POLLIN, 0 } };
         zmq::poll (&items[0], 1, d_timeout);
 
         //  If we got a reply, process
diff --git a/gr-zeromq/lib/sub_msg_source_impl.cc b/gr-zeromq/lib/sub_msg_source_impl.cc
index 0a11ea77f0..4a44442e62 100644
--- a/gr-zeromq/lib/sub_msg_source_impl.cc
+++ b/gr-zeromq/lib/sub_msg_source_impl.cc
@@ -87,7 +87,7 @@ namespace gr {
     {
       while(!d_finished){
 
-        zmq::pollitem_t items[] = { { *d_socket, 0, ZMQ_POLLIN, 0 } };
+        zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, ZMQ_POLLIN, 0 } };
         zmq::poll(&items[0], 1, d_timeout);
 
         //  If we got a reply, process
author	Johnathan Corgan <johnathan@corganlabs.com>	2016-06-28 11:39:32 -0700
committer	Johnathan Corgan <johnathan@corganlabs.com>	2016-06-28 11:39:32 -0700
commit	229dbd0aab5f2ef6819773f79eb17cdc8f27773a (patch)
tree	b81361d68eebbf7fbeecb435d88f9750a47b872f
parent	45cbe43da3317d9c872672553185d36c5cdf59bd (diff)
parent	e8e6ab08a7f943db17666bef4c49f8a4aef3b60f (diff)