mirror of
https://github.com/libretro/RetroArch
synced 2025-04-16 08:43:10 +00:00
- Rename switch_nx_thread_audio.c to switch_thread_audio.c
- Change code to C89-comformant - Some small formatting/style nits - Cleanup Makefile.common object listings
This commit is contained in:
twinaphex
parent
db43033f9a
commit
6ff2c96d03
@ -825,22 +825,17 @@ endif
|
||||
|
||||
ifeq ($(TARGET), retroarch_switch)
|
||||
ifeq ($(HAVE_LIBNX), 1)
|
||||
OBJ += input/drivers_joypad/switch_joypad.o \
|
||||
input/drivers/switch_input.o \
|
||||
menu/drivers_display/menu_display_switch.o \
|
||||
gfx/drivers/switch_nx_gfx.o \
|
||||
audio/drivers/switch_audio.o \
|
||||
audio/drivers/switch_nx_thread_audio.o \
|
||||
frontend/drivers/platform_switch.o
|
||||
OBJ += menu/drivers_display/menu_display_switch.o \
|
||||
gfx/drivers/switch_nx_gfx.o
|
||||
else
|
||||
OBJ += gfx/drivers/switch_gfx.o \
|
||||
OBJ += gfx/drivers/switch_gfx.o
|
||||
endif
|
||||
OBJ += audio/drivers/switch_audio.o \
|
||||
audio/drivers/switch_thread_audio.o \
|
||||
input/drivers/switch_input.o \
|
||||
input/drivers_joypad/switch_joypad.o \
|
||||
audio/drivers/switch_audio.o \
|
||||
audio/drivers/switch_nx_thread_audio.o \
|
||||
frontend/drivers/platform_switch.o
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_WAYLAND), 1)
|
||||
OBJ += gfx/drivers_context/wayland_ctx.o \
|
||||
|
||||
@ -70,6 +70,9 @@ typedef struct
|
||||
|
||||
static void mainLoop(void* data)
|
||||
{
|
||||
Result rc;
|
||||
uint32_t released_out_count = 0;
|
||||
compat_audio_out_buffer *released_out_buffer = NULL;
|
||||
switch_thread_audio_t *swa = (switch_thread_audio_t*)data;
|
||||
|
||||
if (!swa)
|
||||
@ -77,12 +80,11 @@ static void mainLoop(void* data)
|
||||
|
||||
RARCH_LOG("[Audio]: start mainLoop cpu %u tid %u\n", svcGetCurrentProcessorNumber(), swa->thread.handle);
|
||||
|
||||
compat_audio_out_buffer* released_out_buffer = NULL;
|
||||
uint32_t released_out_count;
|
||||
Result rc;
|
||||
|
||||
while (swa->running)
|
||||
{
|
||||
size_t buf_avail, avail, to_write;
|
||||
|
||||
if (!released_out_buffer)
|
||||
{
|
||||
#ifdef HAVE_LIBNX
|
||||
@ -103,13 +105,14 @@ static void mainLoop(void* data)
|
||||
released_out_buffer->data_size = 0;
|
||||
}
|
||||
|
||||
size_t bufAvail = released_out_buffer->buffer_size - released_out_buffer->data_size;
|
||||
buf_avail = released_out_buffer->buffer_size - released_out_buffer->data_size;
|
||||
|
||||
compat_mutex_lock(&swa->fifoLock);
|
||||
|
||||
size_t avail = fifo_read_avail(swa->fifo);
|
||||
size_t to_write = MIN(avail, bufAvail);
|
||||
if (to_write > 0) {
|
||||
avail = fifo_read_avail(swa->fifo);
|
||||
to_write = MIN(avail, buf_avail);
|
||||
if (to_write > 0)
|
||||
{
|
||||
uint8_t *base;
|
||||
#ifdef HAVE_LIBNX
|
||||
base = (uint8_t*) released_out_buffer->buffer;
|
||||
@ -139,8 +142,9 @@ static void mainLoop(void* data)
|
||||
|
||||
static void *switch_thread_audio_init(const char *device, unsigned rate, unsigned latency, unsigned block_frames, unsigned *new_rate)
|
||||
{
|
||||
(void)device;
|
||||
|
||||
Result rc;
|
||||
unsigned i;
|
||||
uint32_t prio;
|
||||
char names[8][0x20];
|
||||
uint32_t num_names = 0;
|
||||
switch_thread_audio_t *swa = (switch_thread_audio_t *)calloc(1, sizeof(*swa));
|
||||
@ -153,7 +157,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
|
||||
swa->is_paused = true;
|
||||
swa->latency = MAX(latency, 8);
|
||||
|
||||
Result rc = switch_audio_ipc_init();
|
||||
rc = switch_audio_ipc_init();
|
||||
if (R_FAILED(rc))
|
||||
{
|
||||
RARCH_LOG("[Audio]: audio init failed %d\n", (int)rc);
|
||||
@ -171,18 +175,17 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
|
||||
|
||||
swa->sampleRate = audoutGetSampleRate();
|
||||
#else
|
||||
if (audio_ipc_list_outputs(&names[0], 8, &num_names) != RESULT_OK) {
|
||||
if (audio_ipc_list_outputs(&names[0], 8, &num_names) != RESULT_OK)
|
||||
goto fail_audio_ipc;
|
||||
}
|
||||
|
||||
if (num_names != 1) {
|
||||
if (num_names != 1)
|
||||
{
|
||||
RARCH_ERR("[Audio]: got back more than one AudioOut\n");
|
||||
goto fail_audio_ipc;
|
||||
}
|
||||
|
||||
if (audio_ipc_open_output(names[0], &swa->output) != RESULT_OK) {
|
||||
if (audio_ipc_open_output(names[0], &swa->output) != RESULT_OK)
|
||||
goto fail_audio_ipc;
|
||||
}
|
||||
|
||||
swa->sampleRate = swa->output.sample_rate;
|
||||
|
||||
@ -206,7 +209,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
|
||||
*new_rate = swa->sampleRate;
|
||||
swa->fifoSize = (swa->sampleRate * sample_size * swa->latency) / 1000;
|
||||
|
||||
for (int i = 0; i < AUDIO_BUFFER_COUNT; i++)
|
||||
for (i = 0; i < AUDIO_BUFFER_COUNT; i++)
|
||||
{
|
||||
#ifdef HAVE_LIBNX
|
||||
swa->buffers[i].next = NULL; /* Unused */
|
||||
@ -244,7 +247,6 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
|
||||
RARCH_LOG("[Audio]: switch_thread_audio_init device %s requested rate %hu rate %hu latency %hu block_frames %hu fifoSize %lu\n",
|
||||
device, rate, swa->sampleRate, swa->latency, block_frames, swa->fifoSize);
|
||||
|
||||
uint32_t prio;
|
||||
svcGetThreadPriority(&prio, 0xffff8000);
|
||||
rc = compat_thread_create(&swa->thread, &mainLoop, (void*)swa, thread_stack_size, prio - 1, thread_preferred_cpu);
|
||||
|
||||
@ -301,6 +303,7 @@ static bool switch_thread_audio_stop(void *data)
|
||||
|
||||
static void switch_thread_audio_free(void *data)
|
||||
{
|
||||
unsigned i;
|
||||
switch_thread_audio_t *swa = (switch_thread_audio_t *)data;
|
||||
|
||||
if (!swa)
|
||||
@ -322,7 +325,8 @@ static void switch_thread_audio_free(void *data)
|
||||
swa->fifo = NULL;
|
||||
}
|
||||
|
||||
for (int i = 0; i < sizeof(swa->buffers)/sizeof(swa->buffers[0]); i++) {
|
||||
for (i = 0; i < ARRAY_SIZE(swa->buffers); i++)
|
||||
{
|
||||
#ifdef HAVE_LIBNX
|
||||
free(swa->buffers[i].buffer);
|
||||
#else
|
||||
@ -336,23 +340,19 @@ static void switch_thread_audio_free(void *data)
|
||||
|
||||
static ssize_t switch_thread_audio_write(void *data, const void *buf, size_t size)
|
||||
{
|
||||
size_t avail, written;
|
||||
switch_thread_audio_t *swa = (switch_thread_audio_t *)data;
|
||||
|
||||
if (!swa || !swa->running)
|
||||
return 0;
|
||||
|
||||
size_t avail;
|
||||
size_t written;
|
||||
|
||||
if (swa->nonblocking)
|
||||
{
|
||||
compat_mutex_lock(&swa->fifoLock);
|
||||
avail = fifo_write_avail(swa->fifo);
|
||||
written = MIN(avail, size);
|
||||
if (written > 0)
|
||||
{
|
||||
fifo_write(swa->fifo, buf, written);
|
||||
}
|
||||
compat_mutex_unlock(&swa->fifoLock);
|
||||
}
|
||||
else
|
||||
@ -409,10 +409,11 @@ static bool switch_thread_audio_use_float(void *data)
|
||||
|
||||
static size_t switch_thread_audio_write_avail(void *data)
|
||||
{
|
||||
size_t val;
|
||||
switch_thread_audio_t* swa = (switch_thread_audio_t*)data;
|
||||
|
||||
compat_mutex_lock(&swa->fifoLock);
|
||||
size_t val = fifo_write_avail(swa->fifo);
|
||||
val = fifo_write_avail(swa->fifo);
|
||||
compat_mutex_unlock(&swa->fifoLock);
|
||||
|
||||
return val;
|
||||
Loading…
x
Reference in New Issue
Block a user