From bcd58e48a15e7f9079ae63c352c7dbd25d2e6c86 Mon Sep 17 00:00:00 2001
From: Mooneer Salem <mooneer@gmail.com>
Date: Mon, 28 Oct 2024 02:04:08 -0700
Subject: [PATCH] Suppress spurious warnings from Opus/RADE compilation.

---
 cmake/BuildOpus.cmake    | 10 +++++++++-
 fargan_config.h.in       | 15 +++++++++++++++
 src/freedv_interface.cpp |  6 +++++-
 src/freedv_interface.h   |  1 +
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 fargan_config.h.in

diff --git a/cmake/BuildOpus.cmake b/cmake/BuildOpus.cmake
index 1dd4fc72..3bc60532 100644
--- a/cmake/BuildOpus.cmake
+++ b/cmake/BuildOpus.cmake
@@ -32,8 +32,11 @@ ExternalProject_Add(build_opus_arm
 ExternalProject_Get_Property(build_opus_arm BINARY_DIR)
 ExternalProject_Get_Property(build_opus_arm SOURCE_DIR)
 set(OPUS_ARM_BINARY_DIR ${BINARY_DIR})
+set(OPUS_ARM_SOURCE_DIR ${SOURCE_DIR})
 ExternalProject_Get_Property(build_opus_x86 BINARY_DIR)
+ExternalProject_Get_Property(build_opus_x86 SOURCE_DIR)
 set(OPUS_X86_BINARY_DIR ${BINARY_DIR})
+set(OPUS_X86_SOURCE_DIR ${SOURCE_DIR})
 
 add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libopus${CMAKE_STATIC_LIBRARY_SUFFIX}
@@ -44,7 +47,12 @@ add_custom_target(
     libopus.a
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libopus${CMAKE_STATIC_LIBRARY_SUFFIX})
 
-include_directories(${SOURCE_DIR}/dnn ${SOURCE_DIR}/celt ${SOURCE_DIR}/include)
+set(FARGAN_CONFIG_H_FILE "${SOURCE_DIR}/config.h")
+set(FARGAN_ARM_CONFIG_H_FILE "${OPUS_ARM_SOURCE_DIR}/config.h")
+set(FARGAN_X86_CONFIG_H_FILE "${OPUS_X86_SOURCE_DIR}/config.h")
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/fargan_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/fargan_config.h")
+include_directories(${SOURCE_DIR}/dnn ${SOURCE_DIR}/celt ${SOURCE_DIR}/include ${CMAKE_CURRENT_BINARY_DIR})
 
 add_library(opus STATIC IMPORTED)
 add_dependencies(opus libopus.a)
diff --git a/fargan_config.h.in b/fargan_config.h.in
new file mode 100644
index 00000000..082d5799
--- /dev/null
+++ b/fargan_config.h.in
@@ -0,0 +1,15 @@
+#ifndef FARGAN_CONFIG_H
+#define FARGAN_CONFIG_H
+
+// Include Opus config.h to suppress warnings
+#ifdef __APPLE__
+#ifdef __aarch64__
+#include "@FARGAN_ARM_CONFIG_H_FILE@"
+#else
+#include "@FARGAN_X86_CONFIG_H_FILE@"
+#endif // __aarch64__
+#else
+#include "@FARGAN_CONFIG_H_FILE@"
+#endif // __APPLE__
+
+#endif // FARGAN_CONFIG_H
diff --git a/src/freedv_interface.cpp b/src/freedv_interface.cpp
index 820e4ee4..06312a21 100644
--- a/src/freedv_interface.cpp
+++ b/src/freedv_interface.cpp
@@ -144,7 +144,11 @@ void FreeDVInterface::start(int txMode, int fifoSizeMs, bool singleRxThread, boo
             txMode_ = mode;
             modemStatsIndex_ = 0;
 
-            rade_ = rade_open("TBD");
+            // Suppress const string warning.
+            // TBD - modelFile may be used by RADE in the future!
+            char modelFile[1];
+            modelFile[0] = 0;
+            rade_ = rade_open(modelFile);
             assert(rade_ != nullptr);
 
             float zeros[320] = {0};
diff --git a/src/freedv_interface.h b/src/freedv_interface.h
index 935307b2..648a95fb 100644
--- a/src/freedv_interface.h
+++ b/src/freedv_interface.h
@@ -45,6 +45,7 @@
 // TBD - need to wrap in "extern C" to avoid linker errors
 extern "C" 
 {
+    #include "fargan_config.h"
     #include "fargan.h"
     #include "lpcnet.h"
 }