summaryrefslogtreecommitdiff
path: root/src/mixer
diff options
context:
space:
mode:
Diffstat (limited to 'src/mixer')
-rw-r--r--src/mixer/audio_miniaudio.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mixer/audio_miniaudio.c b/src/mixer/audio_miniaudio.c
index a0db3f3..bc2da0d 100644
--- a/src/mixer/audio_miniaudio.c
+++ b/src/mixer/audio_miniaudio.c
@@ -1,18 +1,17 @@
#define AL_LOG_SECTION "audio_miniaudio"
#include <al/log.h>
#if defined(__clang__) || defined(__GNUC__)
-_Pragma("GCC diagnostic push") \
-_Pragma("GCC diagnostic ignored \"-Wunused-function\"")
-_Pragma("GCC diagnostic ignored \"-Wunused-variable\"")
-_Pragma("GCC diagnostic ignored \"-Wincompatible-pointer-types\"")
-_Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")
+AL_IGNORE_WARNING("-Wunused-function")
+AL_IGNORE_WARNING("-Wunused-variable")
+AL_IGNORE_WARNING("-Wincompatible-pointer-types")
+AL_IGNORE_WARNING("-Wunknown-pragmas")
#elif _MSC_VER
#pragma warning(push, 0)
#endif
#define MINIAUDIO_IMPLEMENTATION
#include "audio_miniaudio.h"
#if defined(__clang__) || defined(__GNUC__)
-_Pragma("GCC diagnostic pop")
+AL_IGNORE_WARNING_END
#elif _MSC_VER
#pragma warning(pop)
#endif
@@ -155,7 +154,7 @@ static void data_callback(ma_device *device, void *output, const void *input, u3
struct camu_audio_miniaudio *ma = (struct camu_audio_miniaudio *)device->pUserData;
(void)input;
bool silence;
- ma->a.data_callback(ma->a.userdata, output, frame_count, &silence);
+ ma->a.data_callback(ma->a.userdata, (u8 *)output, frame_count, &silence);
}
//#define MINIAUDIO_LOW_LATENCY