From a3a6150ecbb5842568846229f4d1281302e3a09d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20Sobczy=C5=84ski?= <hastoklai@gmail.com>
Date: Tue, 10 Nov 2020 12:31:31 +0100
Subject: [PATCH] adpcm support

---
 src/engine/include/modules/audio.hpp |  2 +-
 src/engine/modules/audio.cpp         |  8 ++------
 src/samples/ari/ari.cpp              | 10 +++++-----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/engine/include/modules/audio.hpp b/src/engine/include/modules/audio.hpp
index 8766491..5bb4be4 100644
--- a/src/engine/include/modules/audio.hpp
+++ b/src/engine/include/modules/audio.hpp
@@ -45,7 +45,7 @@ public:
 private:
     void work();
     static void audioThread();
-    u8 isInitialized, shouldPlay, songLoaded, isVolumeSet, latestVolume, isADPCMLoaded, wasADPCMLoaded;
+    u8 isInitialized, shouldPlay, songLoaded, isVolumeSet, latestVolume, isADPCMLoaded;
     audsrv_adpcm_t adpcmSettings;
     ee_thread_t audioThreadAttr;
     u8 audioThreadStack[STACK_SIZE] ALIGNED(16);
diff --git a/src/engine/modules/audio.cpp b/src/engine/modules/audio.cpp
index d665b7b..1ba2f51 100644
--- a/src/engine/modules/audio.cpp
+++ b/src/engine/modules/audio.cpp
@@ -178,13 +178,9 @@ void Audio::work()
     {
         if (audsrv_load_adpcm(&adpcmSettings, sample1, adpcmFileSize))
             PRINT_ERR("audsrv_load_adpcm() failed!");
-        wasADPCMLoaded = true;
-        isADPCMLoaded = false;
-    }
-    if (wasADPCMLoaded)
-    {
         if (audsrv_play_adpcm(&adpcmSettings))
             PRINT_ERR("audsrv_play_adpcm() failed!");
+        isADPCMLoaded = false;
     }
     if (!shouldPlay)
         return;
@@ -225,7 +221,7 @@ void Audio::test()
 {
     // audsrv_adpcm_set_volume(100);
 
-    FILE *file = fopen("host:chiller.adpcm", "rb");
+    FILE *file = fopen("host:ziobro.adpcm", "rb");
     fseek(file, 0L, SEEK_END);
     adpcmFileSize = ftell(file);
     sample1 = new u8[adpcmFileSize];
diff --git a/src/samples/ari/ari.cpp b/src/samples/ari/ari.cpp
index 5639422..057782e 100644
--- a/src/samples/ari/ari.cpp
+++ b/src/samples/ari/ari.cpp
@@ -34,7 +34,7 @@ void Ari::onInit()
 {
     engine->renderer->setCameraDefinitions(&camera.worldView, &camera.position, camera.planes);
     engine->audio.init(0);
-    engine->audio.setVolume(30);
+    engine->audio.setVolume(60);
     engine->audio.loadSong("MOV-CIRC.WAV");
     engine->audio.play();
 
@@ -88,11 +88,11 @@ void Ari::onUpdate()
 {
     if (engine->pad.isCrossClicked)
     {
-        // engine->audio.stop();
         engine->audio.test();
-        // engine->audio.unloadSong();
-        // engine->audio.loadSong("nob-else.wav");
-        // engine->audio.play();
+        engine->audio.stop();
+        engine->audio.unloadSong();
+        engine->audio.loadSong("nob-else.wav");
+        engine->audio.play();
 
         printf("FPS:%f\n", engine->fps);
     }