From cd1efe40ad1bbd99b665152b1479e9c3390c49c7 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Sat, 22 Nov 2025 17:56:29 +0900 Subject: [PATCH] format --- audio/drv_alsa.c | 41 +++++++++++++++++++-------------------- audio/drv_ao.c | 20 +++++++++---------- audio/pthread/body.c | 30 ++++++++++++++-------------- audio/pthread/decl.c | 6 +++--- include/MDE/Audio/Audio.h | 2 +- 5 files changed, 49 insertions(+), 50 deletions(-) diff --git a/audio/drv_alsa.c b/audio/drv_alsa.c index adc8e52..f87ce7b 100644 --- a/audio/drv_alsa.c +++ b/audio/drv_alsa.c @@ -4,56 +4,56 @@ #include typedef struct driver_context { - snd_pcm_t* device; + snd_pcm_t* device; snd_pcm_hw_params_t* params; } driver_context_t; #include "pthread/decl.c" -static void drv_write(driver_t* drv, void* data, int frames){ - if(snd_pcm_writei(drv->context.device, data, frames) == -EPIPE){ +static void drv_write(driver_t* drv, void* data, int frames) { + if(snd_pcm_writei(drv->context.device, data, frames) == -EPIPE) { snd_pcm_prepare(drv->context.device); } } -static int drv_open(driver_t* drv){ +static int drv_open(driver_t* drv) { snd_pcm_uframes_t frames; - int rate = MDEAudioRate; - - if(snd_pcm_open(&drv->context.device, "default", SND_PCM_STREAM_PLAYBACK, 0) < 0){ + int rate = MDEAudioRate; + + if(snd_pcm_open(&drv->context.device, "default", SND_PCM_STREAM_PLAYBACK, 0) < 0) { MDEAudioClose(drv); return 0; } snd_pcm_hw_params_malloc(&drv->context.params); snd_pcm_hw_params_any(drv->context.device, drv->context.params); - - if(snd_pcm_hw_params_set_access(drv->context.device, drv->context.params, SND_PCM_ACCESS_RW_INTERLEAVED) < 0){ - MDEAudioClose(drv); - return 0; - } - - if(snd_pcm_hw_params_set_format(drv->context.device, drv->context.params, SND_PCM_FORMAT_S16) < 0){ + + if(snd_pcm_hw_params_set_access(drv->context.device, drv->context.params, SND_PCM_ACCESS_RW_INTERLEAVED) < 0) { MDEAudioClose(drv); return 0; } - if(snd_pcm_hw_params_set_channels(drv->context.device, drv->context.params, 2) < 0){ + if(snd_pcm_hw_params_set_format(drv->context.device, drv->context.params, SND_PCM_FORMAT_S16) < 0) { MDEAudioClose(drv); return 0; } - if(snd_pcm_hw_params_set_rate_near(drv->context.device, drv->context.params, &rate, 0) < 0){ + if(snd_pcm_hw_params_set_channels(drv->context.device, drv->context.params, 2) < 0) { MDEAudioClose(drv); return 0; } - if(snd_pcm_hw_params_set_rate(drv->context.device, drv->context.params, rate, 0) < 0){ + if(snd_pcm_hw_params_set_rate_near(drv->context.device, drv->context.params, &rate, 0) < 0) { MDEAudioClose(drv); return 0; } - if(snd_pcm_hw_params(drv->context.device, drv->context.params) < 0){ + if(snd_pcm_hw_params_set_rate(drv->context.device, drv->context.params, rate, 0) < 0) { + MDEAudioClose(drv); + return 0; + } + + if(snd_pcm_hw_params(drv->context.device, drv->context.params) < 0) { MDEAudioClose(drv); return 0; } @@ -64,9 +64,8 @@ static int drv_open(driver_t* drv){ return 1; } - -static void drv_close(driver_t* drv){ - if(drv->context.device != NULL){ +static void drv_close(driver_t* drv) { + if(drv->context.device != NULL) { snd_pcm_drain(drv->context.device); snd_pcm_close(drv->context.device); snd_pcm_hw_params_free(drv->context.params); diff --git a/audio/drv_ao.c b/audio/drv_ao.c index 34985b1..8c18cd2 100644 --- a/audio/drv_ao.c +++ b/audio/drv_ao.c @@ -5,28 +5,28 @@ typedef struct driver_context { ao_sample_format format; - ao_device* device; + ao_device* device; } driver_context_t; #include "pthread/decl.c" -static void drv_write(driver_t* drv, void* data, int frames){ +static void drv_write(driver_t* drv, void* data, int frames) { ao_play(drv->context.device, (char*)data, frames * 2 * 2); } -static int drv_open(driver_t* drv){ +static int drv_open(driver_t* drv) { int id; ao_initialize(); - drv->context.format.bits = 16; - drv->context.format.rate = MDEAudioRate; - drv->context.format.channels = 2; + drv->context.format.bits = 16; + drv->context.format.rate = MDEAudioRate; + drv->context.format.channels = 2; drv->context.format.byte_format = AO_FMT_NATIVE; - drv->context.format.matrix = NULL; + drv->context.format.matrix = NULL; id = ao_default_driver_id(); - if((drv->context.device = ao_open_live(id, &drv->context.format, NULL)) == NULL){ + if((drv->context.device = ao_open_live(id, &drv->context.format, NULL)) == NULL) { MDEAudioClose(drv); return 0; } @@ -36,8 +36,8 @@ static int drv_open(driver_t* drv){ return 1; } -static void drv_close(driver_t* drv){ - if(drv->context.device != NULL){ +static void drv_close(driver_t* drv) { + if(drv->context.device != NULL) { ao_close(drv->context.device); } } diff --git a/audio/pthread/body.c b/audio/pthread/body.c index ada33e1..9976e15 100644 --- a/audio/pthread/body.c +++ b/audio/pthread/body.c @@ -1,16 +1,16 @@ -static void* thread_routine(void* arg){ +static void* thread_routine(void* arg) { driver_t* drv = arg; - void* data; + void* data; data = malloc(drv->frames * 2 * 2); - while(1){ + while(1) { drv->handler(drv, drv->user, data, drv->frames); drv_write(drv, data, drv->frames); pthread_mutex_lock(&drv->mutex); - if(drv->quit){ + if(drv->quit) { pthread_mutex_unlock(&drv->mutex); break; } @@ -22,19 +22,19 @@ static void* thread_routine(void* arg){ return NULL; } -void* MDEAudioOpen(MDEAudioHandler handler, void* user){ - int rate = MDEAudioRate; - driver_t* drv = malloc(sizeof(*drv)); +void* MDEAudioOpen(MDEAudioHandler handler, void* user) { + int rate = MDEAudioRate; + driver_t* drv = malloc(sizeof(*drv)); memset(drv, 0, sizeof(*drv)); - drv->quit = 0; + drv->quit = 0; drv->handler = handler; - drv->user = user; - drv->init = 0; + drv->user = user; + drv->init = 0; pthread_mutex_init(&drv->mutex, NULL); - if(!(drv->init = drv_open(drv))){ + if(!(drv->init = drv_open(drv))) { MDEAudioClose(drv); return NULL; } @@ -42,11 +42,11 @@ void* MDEAudioOpen(MDEAudioHandler handler, void* user){ return drv; } -void MDEAudioClose(void* handle){ +void MDEAudioClose(void* handle) { driver_t* drv = handle; - void* ret; + void* ret; - if(drv->init){ + if(drv->init) { pthread_mutex_lock(&drv->mutex); drv->quit = 1; pthread_mutex_unlock(&drv->mutex); @@ -60,7 +60,7 @@ void MDEAudioClose(void* handle){ free(drv); } -void MDEAudioStart(void* handle){ +void MDEAudioStart(void* handle) { driver_t* drv = handle; pthread_create(&drv->thread, NULL, thread_routine, handle); diff --git a/audio/pthread/decl.c b/audio/pthread/decl.c index 8a80760..b213e76 100644 --- a/audio/pthread/decl.c +++ b/audio/pthread/decl.c @@ -9,9 +9,9 @@ typedef struct driver { int frames; MDEAudioHandler handler; - void* user; + void* user; - int quit; - pthread_t thread; + int quit; + pthread_t thread; pthread_mutex_t mutex; } driver_t; diff --git a/include/MDE/Audio/Audio.h b/include/MDE/Audio/Audio.h index 621de04..3b7cfb9 100644 --- a/include/MDE/Audio/Audio.h +++ b/include/MDE/Audio/Audio.h @@ -13,7 +13,7 @@ extern "C" { #define MDEAudioRate 48000 /* S16, stereo. frames*2*2 == bytes */ -typedef void(*MDEAudioHandler)(void* handle, void* user, void* data, int frames); +typedef void (*MDEAudioHandler)(void* handle, void* user, void* data, int frames); /* driver functions */ void* MDEAudioOpen(MDEAudioHandler handler, void* user);