From 1cd344a838432e46f82a0bc79212dd3d9b77fbe2 Mon Sep 17 00:00:00 2001
From: Max <ikj1234i@yahoo.com>
Date: Thu, 22 Sep 2022 13:26:20 -0400
Subject: [PATCH] bug fixes thx Bill B

---
 install-gr3.9.sh                              |  5 ++++
 .../python/op25/bindings/message_python.cc    | 11 ++++++---
 op25/gr-op25_repeater/apps/rx.py              |  2 +-
 scripts/do_sedpy.sh                           | 23 +++++++++++++++++++
 4 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100755 scripts/do_sedpy.sh

diff --git a/install-gr3.9.sh b/install-gr3.9.sh
index 3d126c8..c252231 100755
--- a/install-gr3.9.sh
+++ b/install-gr3.9.sh
@@ -14,6 +14,8 @@ if [ ! -d op25/gr-op25 ]; then
 	exit
 fi
 
+TOP_DIR=$PWD
+
 sudo apt-get update
 sudo apt-get build-dep gnuradio
 sudo apt-get install gnuradio gnuradio-dev gr-osmosdr librtlsdr-dev libuhd-dev  libhackrf-dev libitpp-dev libpcap-dev cmake git swig build-essential pkg-config doxygen python3-numpy python3-waitress python3-requests python3-pip pybind11-dev clang-format libsndfile1-dev
@@ -46,6 +48,9 @@ sudo make install
 sudo ldconfig
 cd ../
 
+cd $TOP_DIR/op25
+sh ../scripts/do_sedpy.sh
+
 echo ====== 
 echo ====== NOTICE 
 echo ====== 
diff --git a/op25/gr-op25/python/op25/bindings/message_python.cc b/op25/gr-op25/python/op25/bindings/message_python.cc
index 2a9f995..0e6e469 100644
--- a/op25/gr-op25/python/op25/bindings/message_python.cc
+++ b/op25/gr-op25/python/op25/bindings/message_python.cc
@@ -104,9 +104,14 @@ void bind_message(py::module& m)
 
 
         
-        .def("to_string",&message::to_string,       
-            D(message,to_string)
-        )
+        //.def("to_string",&message::to_string,       
+        //    D(message,to_string)
+        //)
+        .def("to_string",
+             [](std::shared_ptr<message> msg) {
+                 std::string s = msg->to_string();
+                 return py::bytes(s); // Return the data without transcoding
+             })
 
         ;
 
diff --git a/op25/gr-op25_repeater/apps/rx.py b/op25/gr-op25_repeater/apps/rx.py
index 2d99125..2e30380 100755
--- a/op25/gr-op25_repeater/apps/rx.py
+++ b/op25/gr-op25_repeater/apps/rx.py
@@ -156,7 +156,7 @@ class p25_rx_block (gr.top_block):
                 self.rtl_found = True
 
             gain_names = self.src.get_gain_names()
-            for name in gain_names:
+            if 0:  #  pending fix crash ### for name in gain_names:
                 range1 = self.src.get_gain_range(name)
                 print ("gain: name: %s range: start %d stop %d step %d" % (name, range1[0].start(), range1[0].stop(), range1[0].step()))
             if options.gains:
diff --git a/scripts/do_sedpy.sh b/scripts/do_sedpy.sh
new file mode 100755
index 0000000..b03cfcd
--- /dev/null
+++ b/scripts/do_sedpy.sh
@@ -0,0 +1,23 @@
+#! /bin/sh
+
+me=$0
+
+py=`find . -type f -name '*.py' | grep -v doxy`
+
+files=`grep -l 'filter\.firdes\.WIN_' $py`
+for f in $files; do
+	echo $me editing $f
+	sed -i 's/filter\.firdes\.WIN_/fft.window.WIN_/' $f
+done
+
+files=`grep -l 'gr\.msg_queue' $py`
+for f in $files; do
+	echo $me editing $f
+	sed -i 's/gr\.msg_queue/op25.msg_queue/' $f
+done
+
+files=`grep -l 'gr\.message' $py`
+for f in $files; do
+	echo $me editing $f
+	sed -i 's/gr\.message/op25.message/' $f
+done