diff options
Diffstat (limited to 'net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch')
| -rw-r--r-- | net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch | 250 |
1 files changed, 0 insertions, 250 deletions
diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch deleted file mode 100644 index 0057b38836ce..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch +++ /dev/null @@ -1,250 +0,0 @@ -From faa5e19e15f77a0ba5e7f854df6517c280034369 Mon Sep 17 00:00:00 2001 -From: Johannes Demel <demel@ant.uni-bremen.de> -Date: Sat, 9 May 2020 15:28:58 +0200 -Subject: [PATCH] msg_handler: Use lambdas in gr-qtgui - -gr-qtgui uses lambdas instead of `boost::bind` to register message -handlers now. This component makes quite heavy use of message handlers. ---- - gr-qtgui/lib/const_sink_c_impl.cc | 3 +-- - gr-qtgui/lib/edit_box_msg_impl.cc | 2 +- - gr-qtgui/lib/freq_sink_c_impl.cc | 6 +++--- - gr-qtgui/lib/freq_sink_f_impl.cc | 6 +++--- - gr-qtgui/lib/histogram_sink_f_impl.cc | 3 +-- - gr-qtgui/lib/sink_c_impl.cc | 2 +- - gr-qtgui/lib/sink_f_impl.cc | 2 +- - gr-qtgui/lib/time_raster_sink_b_impl.cc | 3 +-- - gr-qtgui/lib/time_raster_sink_f_impl.cc | 3 +-- - gr-qtgui/lib/time_sink_c_impl.cc | 2 +- - gr-qtgui/lib/time_sink_f_impl.cc | 2 +- - gr-qtgui/lib/waterfall_sink_c_impl.cc | 9 +++------ - gr-qtgui/lib/waterfall_sink_f_impl.cc | 9 +++------ - 13 files changed, 21 insertions(+), 31 deletions(-) - -diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc -index 852f6ee109..e4b01907f1 100644 ---- a/gr-qtgui/lib/const_sink_c_impl.cc -+++ b/gr-qtgui/lib/const_sink_c_impl.cc -@@ -69,8 +69,7 @@ const_sink_c_impl::const_sink_c_impl(int size, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&const_sink_c_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - for (int i = 0; i < d_nconnections; i++) { - d_residbufs_real.push_back( -diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc -index 8713aa820e..04f860785a 100644 ---- a/gr-qtgui/lib/edit_box_msg_impl.cc -+++ b/gr-qtgui/lib/edit_box_msg_impl.cc -@@ -158,7 +158,7 @@ edit_box_msg_impl::edit_box_msg_impl(data_type_t type, - message_port_register_out(d_port); - message_port_register_in(pmt::mp("val")); - -- set_msg_handler(pmt::mp("val"), boost::bind(&edit_box_msg_impl::set_value, this, _1)); -+ set_msg_handler(pmt::mp("val"), [this](pmt::pmt_t msg) { this->set_value(msg); }); - } - - edit_box_msg_impl::~edit_box_msg_impl() -diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc -index 3a34df6ec6..137bccc3c3 100644 ---- a/gr-qtgui/lib/freq_sink_c_impl.cc -+++ b/gr-qtgui/lib/freq_sink_c_impl.cc -@@ -82,17 +82,17 @@ freq_sink_c_impl::freq_sink_c_impl(int fftsize, - - // setup bw input port - message_port_register_in(d_port_bw); -- set_msg_handler(d_port_bw, boost::bind(&freq_sink_c_impl::handle_set_bw, this, _1)); -+ set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); }); - - // setup output message port to post frequency when display is - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, boost::bind(&freq_sink_c_impl::handle_set_freq, this, _1)); -+ set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); }); - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&freq_sink_c_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - d_main_gui = NULL; - -diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc -index c14bfc31fd..0b1757c03c 100644 ---- a/gr-qtgui/lib/freq_sink_f_impl.cc -+++ b/gr-qtgui/lib/freq_sink_f_impl.cc -@@ -82,17 +82,17 @@ freq_sink_f_impl::freq_sink_f_impl(int fftsize, - - // setup bw input port - message_port_register_in(d_port_bw); -- set_msg_handler(d_port_bw, boost::bind(&freq_sink_f_impl::handle_set_bw, this, _1)); -+ set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); }); - - // setup output message port to post frequency when display is - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, boost::bind(&freq_sink_f_impl::handle_set_freq, this, _1)); -+ set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); }); - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&freq_sink_f_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - d_main_gui = NULL; - -diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc -index d16de932ca..fd357bf40a 100644 ---- a/gr-qtgui/lib/histogram_sink_f_impl.cc -+++ b/gr-qtgui/lib/histogram_sink_f_impl.cc -@@ -81,8 +81,7 @@ histogram_sink_f_impl::histogram_sink_f_impl(int size, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&histogram_sink_f_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - // +1 for the PDU buffer - for (int i = 0; i < d_nconnections + 1; i++) { -diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc -index d3feb9d16c..8f7ff36ba2 100644 ---- a/gr-qtgui/lib/sink_c_impl.cc -+++ b/gr-qtgui/lib/sink_c_impl.cc -@@ -96,7 +96,7 @@ sink_c_impl::sink_c_impl(int fftsize, - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, boost::bind(&sink_c_impl::handle_set_freq, this, _1)); -+ set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); }); - - d_main_gui = NULL; - -diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc -index 418b630b78..0b1eccad12 100644 ---- a/gr-qtgui/lib/sink_f_impl.cc -+++ b/gr-qtgui/lib/sink_f_impl.cc -@@ -95,7 +95,7 @@ sink_f_impl::sink_f_impl(int fftsize, - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, boost::bind(&sink_f_impl::handle_set_freq, this, _1)); -+ set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); }); - - d_main_gui = NULL; - -diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc -index 045c216b00..063ed09d0c 100644 ---- a/gr-qtgui/lib/time_raster_sink_b_impl.cc -+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc -@@ -83,8 +83,7 @@ time_raster_sink_b_impl::time_raster_sink_b_impl(double samp_rate, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&time_raster_sink_b_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - d_scale = 1.0f; - -diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc -index d186f319da..df94d217bd 100644 ---- a/gr-qtgui/lib/time_raster_sink_f_impl.cc -+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc -@@ -83,8 +83,7 @@ time_raster_sink_f_impl::time_raster_sink_f_impl(double samp_rate, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&time_raster_sink_f_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - d_icols = static_cast<int>(ceil(d_cols)); - d_tmpflt = (float*)volk_malloc(d_icols * sizeof(float), volk_get_alignment()); -diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc -index b73a1c1ad3..26dc5d2e32 100644 ---- a/gr-qtgui/lib/time_sink_c_impl.cc -+++ b/gr-qtgui/lib/time_sink_c_impl.cc -@@ -80,7 +80,7 @@ time_sink_c_impl::time_sink_c_impl(int size, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_c_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - // +2 for the PDU message buffers - for (unsigned int n = 0; n < d_nconnections + 2; n++) { -diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc -index df13998d75..8f41d02143 100644 ---- a/gr-qtgui/lib/time_sink_f_impl.cc -+++ b/gr-qtgui/lib/time_sink_f_impl.cc -@@ -80,7 +80,7 @@ time_sink_f_impl::time_sink_f_impl(int size, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_f_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - // +1 for the PDU buffer - for (unsigned int n = 0; n < d_nconnections + 1; n++) { -diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc -index fcf2ed98bc..20cebbcbda 100644 ---- a/gr-qtgui/lib/waterfall_sink_c_impl.cc -+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc -@@ -117,20 +117,17 @@ waterfall_sink_c_impl::waterfall_sink_c_impl(int fftsize, - - // setup bw input port - message_port_register_in(d_port_bw); -- set_msg_handler(d_port_bw, -- boost::bind(&waterfall_sink_c_impl::handle_set_bw, this, _1)); -+ set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); }); - - // setup output message port to post frequency when display is - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, -- boost::bind(&waterfall_sink_c_impl::handle_set_freq, this, _1)); -+ set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); }); - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&waterfall_sink_c_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - } - - waterfall_sink_c_impl::~waterfall_sink_c_impl() -diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc -index aa1037a472..4ba6427f08 100644 ---- a/gr-qtgui/lib/waterfall_sink_f_impl.cc -+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc -@@ -115,20 +115,17 @@ waterfall_sink_f_impl::waterfall_sink_f_impl(int fftsize, - - // setup bw input port - message_port_register_in(d_port_bw); -- set_msg_handler(d_port_bw, -- boost::bind(&waterfall_sink_f_impl::handle_set_bw, this, _1)); -+ set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); }); - - // setup output message port to post frequency when display is - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, -- boost::bind(&waterfall_sink_f_impl::handle_set_freq, this, _1)); -+ set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); }); - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&waterfall_sink_f_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - } - - waterfall_sink_f_impl::~waterfall_sink_f_impl() |