From 6f5f600f47cc80cf4bd4d0ec014c6eea1a442d33 Mon Sep 17 00:00:00 2001 From: Mats A Date: Tue, 7 Apr 2020 13:23:06 +0200 Subject: [PATCH 1/2] rename U64_MAX to UINT64_MAX due to libnx changes --- audio/drivers/switch_audio.c | 2 +- audio/drivers/switch_thread_audio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/drivers/switch_audio.c b/audio/drivers/switch_audio.c index 4b9a20259c..4716844696 100644 --- a/audio/drivers/switch_audio.c +++ b/audio/drivers/switch_audio.c @@ -106,7 +106,7 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size) num = 0; #ifdef HAVE_LIBNX - if (audoutWaitPlayFinish(&swa->current_buffer, &num, U64_MAX) != 0) { } + if (audoutWaitPlayFinish(&swa->current_buffer, &num, UINT64_MAX) != 0) { } #else svcWaitSynchronization(&handle_idx, &swa->event, 1, 33333333); svcResetSignal(swa->event); diff --git a/audio/drivers/switch_thread_audio.c b/audio/drivers/switch_thread_audio.c index ef1d10864b..5ccc455921 100644 --- a/audio/drivers/switch_thread_audio.c +++ b/audio/drivers/switch_thread_audio.c @@ -86,7 +86,7 @@ static void mainLoop(void* data) if (!released_out_buffer) { #ifdef HAVE_LIBNX - rc = audoutWaitPlayFinish(&released_out_buffer, &released_out_count, U64_MAX); + rc = audoutWaitPlayFinish(&released_out_buffer, &released_out_count, UINT64_MAX); #else uint32_t handle_idx = 0; svcWaitSynchronization(&handle_idx, &swa->event, 1, 33333333); From e3cbd2e62ff60a963e67b7acd86081b332ef18f8 Mon Sep 17 00:00:00 2001 From: Mats A Date: Sat, 11 Apr 2020 18:07:59 +0200 Subject: [PATCH 2/2] add define to keep compat with previous libnx release --- audio/drivers/switch_audio_compat.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/audio/drivers/switch_audio_compat.h b/audio/drivers/switch_audio_compat.h index 8f9b228376..86b7124b84 100644 --- a/audio/drivers/switch_audio_compat.h +++ b/audio/drivers/switch_audio_compat.h @@ -46,6 +46,10 @@ typedef AudioOutBuffer compat_audio_out_buffer; #define switch_audio_ipc_output_stop(a) audoutStopAudioOut() #define switch_audio_ipc_output_start(a) audoutStartAudioOut() +#ifndef UINT64_MAX +#define UINT64_MAX U64_MAX +#endif + #else /* libtransistor definitions */