From 1011dd1081c8373a338f5cb9330e4069dd0f3fe3 Mon Sep 17 00:00:00 2001
From: Silvano Seva <silseva@fastwebnet.it>
Date: Wed, 15 Mar 2023 19:36:35 +0100
Subject: [PATCH] Moved audio_stream.h from interfaces to core headers

---
 openrtx/include/{interfaces => core}/audio_stream.h | 12 +++---------
 openrtx/include/interfaces/audio.h                  |  9 +++++++++
 openrtx/include/protocols/M17/M17Demodulator.hpp    |  2 +-
 openrtx/include/protocols/M17/M17Modulator.hpp      |  2 +-
 openrtx/src/core/audio_codec.c                      |  2 +-
 openrtx/src/protocols/M17/M17Demodulator.cpp        |  2 +-
 platform/drivers/audio/inputStream_GDx.c            |  2 +-
 platform/drivers/audio/inputStream_MDx.cpp          |  2 +-
 platform/drivers/audio/inputStream_Mod17.cpp        |  2 +-
 platform/drivers/audio/inputStream_linux.cpp        |  2 +-
 platform/drivers/audio/outputStream_GDx.c           |  2 +-
 platform/drivers/audio/outputStream_MDx.cpp         |  2 +-
 platform/drivers/audio/outputStream_Mod17.cpp       |  2 +-
 platform/drivers/audio/outputStream_linux.c         |  2 +-
 tests/platform/codec2_encode_test.c                 |  2 +-
 tests/platform/mic_test.c                           |  2 +-
 tests/platform/rx_test.c                            |  2 +-
 tests/unit/M17_demodulator.cpp                      |  2 +-
 tests/unit/linux_inputStream_test.cpp               |  2 +-
 tests/unit/play_sine.c                              |  2 +-
 20 files changed, 30 insertions(+), 27 deletions(-)
 rename openrtx/include/{interfaces => core}/audio_stream.h (95%)

diff --git a/openrtx/include/interfaces/audio_stream.h b/openrtx/include/core/audio_stream.h
similarity index 95%
rename from openrtx/include/interfaces/audio_stream.h
rename to openrtx/include/core/audio_stream.h
index 0d28372b..86ca86f8 100644
--- a/openrtx/include/interfaces/audio_stream.h
+++ b/openrtx/include/core/audio_stream.h
@@ -24,21 +24,15 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <sys/types.h>
-#include "audio.h"
+#include <interfaces/audio.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef int16_t stream_sample_t;
-typedef int8_t  streamId;
 
-enum BufMode
-{
-    BUF_LINEAR,        ///< Linear buffer mode, conversion stops when full.
-    BUF_CIRC_DOUBLE    ///< Circular double buffer mode, conversion never stops,
-                       ///  thread woken up whenever half of the buffer is full.
-};
+typedef int8_t streamId;
+
 
 typedef struct
 {
diff --git a/openrtx/include/interfaces/audio.h b/openrtx/include/interfaces/audio.h
index 311d43e2..25c40eca 100644
--- a/openrtx/include/interfaces/audio.h
+++ b/openrtx/include/interfaces/audio.h
@@ -55,6 +55,15 @@ enum AudioPriority
     PRIO_TX            ///< Priority level of outward audio directed to TX stage
 };
 
+enum BufMode
+{
+    BUF_LINEAR,        ///< Linear buffer mode, conversion stops when full.
+    BUF_CIRC_DOUBLE    ///< Circular double buffer mode, conversion never stops,
+                       ///  thread woken up whenever half of the buffer is full.
+};
+
+typedef int16_t stream_sample_t;
+
 /**
  * Initialise low-level audio management module.
  */
diff --git a/openrtx/include/protocols/M17/M17Demodulator.hpp b/openrtx/include/protocols/M17/M17Demodulator.hpp
index 254be6da..4363d5cc 100644
--- a/openrtx/include/protocols/M17/M17Demodulator.hpp
+++ b/openrtx/include/protocols/M17/M17Demodulator.hpp
@@ -34,7 +34,7 @@
 #include <dsp.h>
 #include <cmath>
 #include <audio_path.h>
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <M17/M17Datatypes.hpp>
 #include <M17/M17Constants.hpp>
 
diff --git a/openrtx/include/protocols/M17/M17Modulator.hpp b/openrtx/include/protocols/M17/M17Modulator.hpp
index de5feff7..49d14dcd 100644
--- a/openrtx/include/protocols/M17/M17Modulator.hpp
+++ b/openrtx/include/protocols/M17/M17Modulator.hpp
@@ -25,7 +25,7 @@
 #error This header is C++ only!
 #endif
 
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <M17/PwmCompensator.hpp>
 #include <M17/M17Constants.hpp>
 #include <audio_path.h>
diff --git a/openrtx/src/core/audio_codec.c b/openrtx/src/core/audio_codec.c
index 43435231..39ad82a6 100644
--- a/openrtx/src/core/audio_codec.c
+++ b/openrtx/src/core/audio_codec.c
@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <audio_codec.h>
 #include <pthread.h>
 #include <codec2.h>
diff --git a/openrtx/src/protocols/M17/M17Demodulator.cpp b/openrtx/src/protocols/M17/M17Demodulator.cpp
index eccf381e..0d6e617d 100644
--- a/openrtx/src/protocols/M17/M17Demodulator.cpp
+++ b/openrtx/src/protocols/M17/M17Demodulator.cpp
@@ -23,7 +23,7 @@
 #include <M17/M17Demodulator.hpp>
 #include <M17/M17DSP.hpp>
 #include <M17/M17Utils.hpp>
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <math.h>
 #include <cstring>
 #include <stdio.h>
diff --git a/platform/drivers/audio/inputStream_GDx.c b/platform/drivers/audio/inputStream_GDx.c
index 7fb0e3e0..4d9038f7 100644
--- a/platform/drivers/audio/inputStream_GDx.c
+++ b/platform/drivers/audio/inputStream_GDx.c
@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <hwconfig.h>
 #include <stddef.h>
 
diff --git a/platform/drivers/audio/inputStream_MDx.cpp b/platform/drivers/audio/inputStream_MDx.cpp
index af0e490e..8e252ecf 100644
--- a/platform/drivers/audio/inputStream_MDx.cpp
+++ b/platform/drivers/audio/inputStream_MDx.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <kernel/scheduler/scheduler.h>
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <toneGenerator_MDx.h>
 #include <peripherals/gpio.h>
 #include <hwconfig.h>
diff --git a/platform/drivers/audio/inputStream_Mod17.cpp b/platform/drivers/audio/inputStream_Mod17.cpp
index 4ec2057a..5e8662cd 100644
--- a/platform/drivers/audio/inputStream_Mod17.cpp
+++ b/platform/drivers/audio/inputStream_Mod17.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <kernel/scheduler/scheduler.h>
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <toneGenerator_MDx.h>
 #include <peripherals/gpio.h>
 #include <hwconfig.h>
diff --git a/platform/drivers/audio/inputStream_linux.cpp b/platform/drivers/audio/inputStream_linux.cpp
index fde82819..189e6c18 100644
--- a/platform/drivers/audio/inputStream_linux.cpp
+++ b/platform/drivers/audio/inputStream_linux.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <hwconfig.h>
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <stddef.h>
 
 #include <atomic>
diff --git a/platform/drivers/audio/outputStream_GDx.c b/platform/drivers/audio/outputStream_GDx.c
index fc8922ef..1b597939 100644
--- a/platform/drivers/audio/outputStream_GDx.c
+++ b/platform/drivers/audio/outputStream_GDx.c
@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 
 streamId outputStream_start(const enum AudioSink destination,
                             const enum AudioPriority prio,
diff --git a/platform/drivers/audio/outputStream_MDx.cpp b/platform/drivers/audio/outputStream_MDx.cpp
index a801900f..b75b553f 100644
--- a/platform/drivers/audio/outputStream_MDx.cpp
+++ b/platform/drivers/audio/outputStream_MDx.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <kernel/scheduler/scheduler.h>
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <toneGenerator_MDx.h>
 #include <data_conversion.h>
 #include <timers.h>
diff --git a/platform/drivers/audio/outputStream_Mod17.cpp b/platform/drivers/audio/outputStream_Mod17.cpp
index f9b85a64..a74b1cd1 100644
--- a/platform/drivers/audio/outputStream_Mod17.cpp
+++ b/platform/drivers/audio/outputStream_Mod17.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <kernel/scheduler/scheduler.h>
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <peripherals/gpio.h>
 #include <data_conversion.h>
 #include <hwconfig.h>
diff --git a/platform/drivers/audio/outputStream_linux.c b/platform/drivers/audio/outputStream_linux.c
index 722376f4..60ca23dc 100644
--- a/platform/drivers/audio/outputStream_linux.c
+++ b/platform/drivers/audio/outputStream_linux.c
@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <pulse/pulseaudio.h>
 #include <pulse/simple.h>
 #include <pulse/error.h>
diff --git a/tests/platform/codec2_encode_test.c b/tests/platform/codec2_encode_test.c
index 79984856..57bfc68b 100644
--- a/tests/platform/codec2_encode_test.c
+++ b/tests/platform/codec2_encode_test.c
@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <interfaces/audio_path.h>
 #include <interfaces/platform.h>
 #include <interfaces/delays.h>
diff --git a/tests/platform/mic_test.c b/tests/platform/mic_test.c
index e3be6dc2..fb2e4a24 100644
--- a/tests/platform/mic_test.c
+++ b/tests/platform/mic_test.c
@@ -23,7 +23,7 @@
 #include <interfaces/delays.h>
 #include <interfaces/audio.h>
 #include <interfaces/audio_path.h>
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <interfaces/platform.h>
 #include <dsp.h>
 
diff --git a/tests/platform/rx_test.c b/tests/platform/rx_test.c
index 1c5566ea..74a388da 100644
--- a/tests/platform/rx_test.c
+++ b/tests/platform/rx_test.c
@@ -23,7 +23,7 @@
 #include <interfaces/delays.h>
 #include <interfaces/audio.h>
 #include <interfaces/audio_path.h>
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <interfaces/platform.h>
 #include <dsp.h>
 
diff --git a/tests/unit/M17_demodulator.cpp b/tests/unit/M17_demodulator.cpp
index 5324aacd..300b3e67 100644
--- a/tests/unit/M17_demodulator.cpp
+++ b/tests/unit/M17_demodulator.cpp
@@ -29,7 +29,7 @@
 #include <M17/M17DSP.h>
 #include <M17/M17Demodulator.h>
 #include <M17/M17Utils.h>
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 
 using namespace std;
 
diff --git a/tests/unit/linux_inputStream_test.cpp b/tests/unit/linux_inputStream_test.cpp
index 3b07e1fe..5bfb0d24 100644
--- a/tests/unit/linux_inputStream_test.cpp
+++ b/tests/unit/linux_inputStream_test.cpp
@@ -23,7 +23,7 @@
 #include <thread>
 #include <vector>
 
-#include "interfaces/audio_stream.h"
+#include "audio_stream.h"
 
 static const char* files[] = {"MIC.raw", "RTX.raw", "MCU.raw"};
 
diff --git a/tests/unit/play_sine.c b/tests/unit/play_sine.c
index 5c0711d3..fab72e7a 100644
--- a/tests/unit/play_sine.c
+++ b/tests/unit/play_sine.c
@@ -22,7 +22,7 @@
 // Test private methods
 #define private public
 
-#include <interfaces/audio_stream.h>
+#include <audio_stream.h>
 #include <math.h>
 #include <stdio.h>