summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xgnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py4
-rwxr-xr-xgnuradio-runtime/examples/network/audio_source.py2
-rwxr-xr-xgnuradio-runtime/examples/network/dial_tone_source.py2
-rwxr-xr-xgnuradio-runtime/examples/network/vector_source.py2
-rwxr-xr-xgr-digital/examples/narrowband/benchmark_add_channel.py4
-rwxr-xr-xgr-digital/examples/ofdm/benchmark_add_channel.py4
-rwxr-xr-xgr-uhd/apps/hf_radio/radio.py2
-rw-r--r--gr-zeromq/lib/base_impl.cc2
-rw-r--r--gr-zeromq/lib/pull_msg_source_impl.cc2
-rw-r--r--gr-zeromq/lib/push_sink_impl.cc2
-rw-r--r--gr-zeromq/lib/rep_msg_sink_impl.cc2
-rw-r--r--gr-zeromq/lib/rep_sink_impl.cc2
-rw-r--r--gr-zeromq/lib/req_msg_source_impl.cc4
-rw-r--r--gr-zeromq/lib/sub_msg_source_impl.cc2
14 files changed, 18 insertions, 18 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/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-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
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 10:09:09 +0000