Moved audio_stream.h from interfaces to core headers

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
+typedef int8_t streamId;
-{
+
-    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 struct
 {

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.
  */

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>
 

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>

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>

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>

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>
 

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>

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>

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>

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,

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>

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>

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>

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>

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>
 

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>
 

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;
 

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"};
 

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>