pyrite-dev/mdelibs
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

format

Browse source
This commit is contained in:
Nishi 2025-11-22 17:56:29 +09:00
commit cd1efe40ad
Signed by: nishi
GPG key ID: 27EF69B208EB9343
5 changed files with 46 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

25
audio/drv_alsa.c
View file

@ -10,17 +10,17 @@ typedef struct driver_context {
#include "pthread/decl.c" #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) {
if(snd_pcm_writei(drv->context.device, data, frames) == -EPIPE){ if(snd_pcm_writei(drv->context.device, data, frames) == -EPIPE) {
snd_pcm_prepare(drv->context.device); 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; snd_pcm_uframes_t frames;
int rate = MDEAudioRate; int rate = MDEAudioRate;
if(snd_pcm_open(&drv->context.device, "default", SND_PCM_STREAM_PLAYBACK, 0) < 0){ if(snd_pcm_open(&drv->context.device, "default", SND_PCM_STREAM_PLAYBACK, 0) < 0) {
MDEAudioClose(drv); MDEAudioClose(drv);
return 0; return 0;
} }
@ -28,32 +28,32 @@ static int drv_open(driver_t* drv){
snd_pcm_hw_params_malloc(&drv->context.params); snd_pcm_hw_params_malloc(&drv->context.params);
snd_pcm_hw_params_any(drv->context.device, 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){ if(snd_pcm_hw_params_set_access(drv->context.device, drv->context.params, SND_PCM_ACCESS_RW_INTERLEAVED) < 0) {
MDEAudioClose(drv); MDEAudioClose(drv);
return 0; 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_format(drv->context.device, drv->context.params, SND_PCM_FORMAT_S16) < 0) {
MDEAudioClose(drv); MDEAudioClose(drv);
return 0; return 0;
} }
if(snd_pcm_hw_params_set_channels(drv->context.device, drv->context.params, 2) < 0){ if(snd_pcm_hw_params_set_channels(drv->context.device, drv->context.params, 2) < 0) {
MDEAudioClose(drv); MDEAudioClose(drv);
return 0; 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_rate_near(drv->context.device, drv->context.params, &rate, 0) < 0) {
MDEAudioClose(drv); MDEAudioClose(drv);
return 0; 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(drv->context.device, drv->context.params, rate, 0) < 0) {
MDEAudioClose(drv); MDEAudioClose(drv);
return 0; return 0;
} }
if(snd_pcm_hw_params(drv->context.device, drv->context.params) < 0){ if(snd_pcm_hw_params(drv->context.device, drv->context.params) < 0) {
MDEAudioClose(drv); MDEAudioClose(drv);
return 0; return 0;
} }
@ -64,9 +64,8 @@ static int drv_open(driver_t* drv){
return 1; return 1;
} }
static void drv_close(driver_t* drv) {
static void drv_close(driver_t* drv){ if(drv->context.device != NULL) {
if(drv->context.device != NULL){
snd_pcm_drain(drv->context.device); snd_pcm_drain(drv->context.device);
snd_pcm_close(drv->context.device); snd_pcm_close(drv->context.device);
snd_pcm_hw_params_free(drv->context.params); snd_pcm_hw_params_free(drv->context.params);

10
audio/drv_ao.c
View file

@ -10,11 +10,11 @@ typedef struct driver_context {
#include "pthread/decl.c" #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); 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; int id;
ao_initialize(); ao_initialize();
@ -26,7 +26,7 @@ static int drv_open(driver_t* drv){
drv->context.format.matrix = NULL; drv->context.format.matrix = NULL;
id = ao_default_driver_id(); 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); MDEAudioClose(drv);
return 0; return 0;
} }
@ -36,8 +36,8 @@ static int drv_open(driver_t* drv){
return 1; return 1;
} }
static void drv_close(driver_t* drv){ static void drv_close(driver_t* drv) {
if(drv->context.device != NULL){ if(drv->context.device != NULL) {
ao_close(drv->context.device); ao_close(drv->context.device);
} }
} }

16
audio/pthread/body.c
View file

@ -1,16 +1,16 @@
static void* thread_routine(void* arg){ static void* thread_routine(void* arg) {
driver_t* drv = arg; driver_t* drv = arg;
void* data; void* data;
data = malloc(drv->frames * 2 * 2); data = malloc(drv->frames * 2 * 2);
while(1){ while(1) {
drv->handler(drv, drv->user, data, drv->frames); drv->handler(drv, drv->user, data, drv->frames);
drv_write(drv, data, drv->frames); drv_write(drv, data, drv->frames);
pthread_mutex_lock(&drv->mutex); pthread_mutex_lock(&drv->mutex);
if(drv->quit){ if(drv->quit) {
pthread_mutex_unlock(&drv->mutex); pthread_mutex_unlock(&drv->mutex);
break; break;
} }
@ -22,7 +22,7 @@ static void* thread_routine(void* arg){
return NULL; return NULL;
} }
void* MDEAudioOpen(MDEAudioHandler handler, void* user){ void* MDEAudioOpen(MDEAudioHandler handler, void* user) {
int rate = MDEAudioRate; int rate = MDEAudioRate;
driver_t* drv = malloc(sizeof(*drv)); driver_t* drv = malloc(sizeof(*drv));
memset(drv, 0, sizeof(*drv)); memset(drv, 0, sizeof(*drv));
@ -34,7 +34,7 @@ void* MDEAudioOpen(MDEAudioHandler handler, void* user){
pthread_mutex_init(&drv->mutex, NULL); pthread_mutex_init(&drv->mutex, NULL);
if(!(drv->init = drv_open(drv))){ if(!(drv->init = drv_open(drv))) {
MDEAudioClose(drv); MDEAudioClose(drv);
return NULL; return NULL;
} }
@ -42,11 +42,11 @@ void* MDEAudioOpen(MDEAudioHandler handler, void* user){
return drv; return drv;
} }
void MDEAudioClose(void* handle){ void MDEAudioClose(void* handle) {
driver_t* drv = handle; driver_t* drv = handle;
void* ret; void* ret;
if(drv->init){ if(drv->init) {
pthread_mutex_lock(&drv->mutex); pthread_mutex_lock(&drv->mutex);
drv->quit = 1; drv->quit = 1;
pthread_mutex_unlock(&drv->mutex); pthread_mutex_unlock(&drv->mutex);
@ -60,7 +60,7 @@ void MDEAudioClose(void* handle){
free(drv); free(drv);
} }
void MDEAudioStart(void* handle){ void MDEAudioStart(void* handle) {
driver_t* drv = handle; driver_t* drv = handle;
pthread_create(&drv->thread, NULL, thread_routine, handle); pthread_create(&drv->thread, NULL, thread_routine, handle);

2
include/MDE/Audio/Audio.h
View file

@ -13,7 +13,7 @@ extern "C" {
#define MDEAudioRate 48000 #define MDEAudioRate 48000
/* S16, stereo. frames*2*2 == bytes */ /* 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 */ /* driver functions */
void* MDEAudioOpen(MDEAudioHandler handler, void* user); void* MDEAudioOpen(MDEAudioHandler handler, void* user);