From b3eb8ec3bea1ec34d6247958ebaa9b2e691ca937 Mon Sep 17 00:00:00 2001
From: FIX94 <fix94.1@gmail.com>
Date: Tue, 22 Nov 2016 02:39:12 +0100
Subject: [PATCH] (WiiU) use some more direct callback for audio updates and
 added safety into it

---
 audio/drivers/wiiu_audio.c        | 40 ++++++++++++++++++++-----------
 wiiu/system/exports/libsndcore2.h |  3 +++
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/audio/drivers/wiiu_audio.c b/audio/drivers/wiiu_audio.c
index 6ced370316..71dc45a1ce 100644
--- a/audio/drivers/wiiu_audio.c
+++ b/audio/drivers/wiiu_audio.c
@@ -63,20 +63,29 @@ typedef struct
 //#define ax_audio_ticks_to_samples(ticks)     (((ticks) * 64) / 82875)
 //#define ax_audio_samples_to_ticks(samples)   (((samples) * 82875) / 64)
 
-AXResult ax_aux_callback(void* data, ax_audio_t* ax)
+static volatile ax_audio_t *wiiu_cb_ax = NULL;
+void wiiu_ax_callback(void)
 {
-   OSUninterruptibleSpinLock_Acquire(&ax->spinlock);
-   //buffer underrun, stop playback to let if fill up
-   if(ax->written < AX_AUDIO_SAMPLE_MIN)
-      AXSetMultiVoiceState(ax->mvoice, AX_VOICE_STATE_STOPPED);
-   //make sure to update written value if voice is running
-   if(AXIsMultiVoiceRunning(ax->mvoice))
-      ax->written -= (ax->written < AX_AUDIO_SAMPLE_COUNT ? ax->written : AX_AUDIO_SAMPLE_COUNT);
+   //possibly called before unregister
+   if(wiiu_cb_ax == NULL)
+      return;
 
-   OSUninterruptibleSpinLock_Release(&ax->spinlock);
-   return AX_RESULT_SUCCESS;
+   ax_audio_t *ax = (ax_audio_t*)wiiu_cb_ax;
+   if(AXIsMultiVoiceRunning(ax->mvoice))
+   {
+      if(OSUninterruptibleSpinLock_TryAcquire(&ax->spinlock))
+      {
+         //buffer underrun, stop playback to let it fill up
+         if(ax->written < AX_AUDIO_SAMPLE_MIN)
+            AXSetMultiVoiceState(ax->mvoice, AX_VOICE_STATE_STOPPED);
+         else //make sure to update written value if voice is running
+            ax->written -= AX_AUDIO_SAMPLE_COUNT;
+         OSUninterruptibleSpinLock_Release(&ax->spinlock);
+      }
+   }
 }
 
+extern void AXRegisterFrameCallback(void *cb);
 static void* ax_audio_init(const char* device, unsigned rate, unsigned latency)
 {
    ax_audio_t* ax = (ax_audio_t*)calloc(1, sizeof(ax_audio_t));
@@ -135,23 +144,26 @@ static void* ax_audio_init(const char* device, unsigned rate, unsigned latency)
 
    config_get_ptr()->audio.out_rate = AX_AUDIO_RATE;
 
-   AXRegisterAuxCallback(AX_DEVICE_TYPE_DRC, 0, 0, (AXAuxCallback)ax_aux_callback, ax);
-
    OSInitSpinLock(&ax->spinlock);
 
+   wiiu_cb_ax = ax;
+   AXRegisterFrameCallback(wiiu_ax_callback);
+
    return ax;
 }
 
 static void ax_audio_free(void* data)
 {
    ax_audio_t* ax = (ax_audio_t*)data;
+   wiiu_cb_ax = NULL;
 
-   AXRegisterAuxCallback(AX_DEVICE_TYPE_DRC, 0, 0, NULL, NULL);
+   AXRegisterFrameCallback(NULL);
    AXFreeMultiVoice(ax->mvoice);
+   AXQuit();
+
    MEM1_free(ax->buffer_l);
    MEM1_free(ax->buffer_r);
    free(ax);
-   AXQuit();
 }
 
 static bool ax_audio_stop(void* data)
diff --git a/wiiu/system/exports/libsndcore2.h b/wiiu/system/exports/libsndcore2.h
index 3a6979fe56..649cabf62e 100644
--- a/wiiu/system/exports/libsndcore2.h
+++ b/wiiu/system/exports/libsndcore2.h
@@ -2,6 +2,9 @@
 EXPORT_BEGIN(sndcore2.rpl);
 
 #include "../rpl/libsndcore2/exports.h"
+
+EXPORT(AXRegisterFrameCallback);
+
 EXPORT(AXAcquireMultiVoice);
 EXPORT(AXSetMultiVoiceDeviceMix);
 EXPORT(AXSetMultiVoiceOffsets);