summaryrefslogtreecommitdiff
path: root/src/mixer
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2024-11-08 14:53:40 -0500
committerAndrew Opalach <andrew@akon.city> 2024-11-08 14:53:40 -0500
commit5e3641e5e692c3f2f644a4bb809c88727cb8bee9 (patch)
treefbac2007fdcebda13406350fdcef977910427078 /src/mixer
parentf56abfafcd4fa722b807278b138f805112cd953e (diff)
downloadcamu-5e3641e5e692c3f2f644a4bb809c88727cb8bee9.tar.gz
camu-5e3641e5e692c3f2f644a4bb809c88727cb8bee9.tar.bz2
camu-5e3641e5e692c3f2f644a4bb809c88727cb8bee9.zip
Command queue for portal and list, work on server
Most of the server stuff can undoubtedly be simplified. I'm still working that out. Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src/mixer')
-rw-r--r--src/mixer/audio_miniaudio.c6
-rw-r--r--src/mixer/mixer.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mixer/audio_miniaudio.c b/src/mixer/audio_miniaudio.c
index 72e1cd8..2a93491 100644
--- a/src/mixer/audio_miniaudio.c
+++ b/src/mixer/audio_miniaudio.c
@@ -54,8 +54,10 @@ static ma_allocation_callbacks alloc_callbacks = {
static void miniaudio_log_callback(void *userdata, u32 level, const char *message)
{
(void)userdata;
- if (level < MA_LOG_LEVEL_WARNING) {
- al_log_debug("audio_miniaudio", message);
+ if (level == MA_LOG_LEVEL_ERROR) {
+ al_log_error("audio_miniaudio", message);
+ } else if (level == MA_LOG_LEVEL_WARNING) {
+ al_log_warn("audio_miniaudio", message);
} else {
al_log_debug("audio_miniaudio", message);
}
diff --git a/src/mixer/mixer.h b/src/mixer/mixer.h
index 729657f..9a15751 100644
--- a/src/mixer/mixer.h
+++ b/src/mixer/mixer.h
@@ -1,7 +1,5 @@
#pragma once
-#define CAMU_MIXER_THREADED
-
#include <al/types.h>
#include <al/array.h>
#ifdef CAMU_MIXER_THREADED