From 9354db6a163d217b4eaa6eae735c06b9b5b0c742 Mon Sep 17 00:00:00 2001
From: goeiecool9999 <7033575+goeiecool9999@users.noreply.github.com>
Date: Sun, 17 Dec 2023 03:38:37 +0100
Subject: [PATCH] fix bugs and clean up

---
 src/Cafe/HW/Latte/Core/Latte.h              |  6 ++-
 src/Cafe/HW/Latte/Core/LatteShaderCache.cpp | 28 +----------
 src/Cafe/HW/Latte/Core/LatteThread.cpp      | 53 +++++++++++++++++++++
 src/Cafe/OS/libs/snd_core/ax_out.cpp        |  3 +-
 src/audio/IAudioAPI.cpp                     |  3 ++
 5 files changed, 64 insertions(+), 29 deletions(-)

diff --git a/src/Cafe/HW/Latte/Core/Latte.h b/src/Cafe/HW/Latte/Core/Latte.h
index dc3cbc91..09a152a3 100644
--- a/src/Cafe/HW/Latte/Core/Latte.h
+++ b/src/Cafe/HW/Latte/Core/Latte.h
@@ -178,4 +178,8 @@ void LatteRenderTarget_updateViewport();
 void Latte_Start();
 void Latte_Stop();
 bool Latte_GetStopSignal(); // returns true if stop was requested or if in stopped state
-void LatteThread_Exit();
\ No newline at end of file
+void LatteThread_Exit();
+
+void LatteThread_InitBootSound();
+void LatteThread_StreamBootSound();
+void LatteThread_ShutdownBootSound();
diff --git a/src/Cafe/HW/Latte/Core/LatteShaderCache.cpp b/src/Cafe/HW/Latte/Core/LatteShaderCache.cpp
index 04159f7c..827c7da9 100644
--- a/src/Cafe/HW/Latte/Core/LatteShaderCache.cpp
+++ b/src/Cafe/HW/Latte/Core/LatteShaderCache.cpp
@@ -376,25 +376,6 @@ void LatteShaderCache_ShowProgress(const std::function <bool(void)>& loadUpdateF
 	
 	auto lastFrameUpdate = tick_cached();
 
-	AudioAPIPtr audioDev;
-	const sint32 samplesPerBlock = 4800;
-	const sint32 audioBlockSize = samplesPerBlock * 2 * 2;
-	try
-	{
-		audioDev = IAudioAPI::CreateDeviceFromConfig(true, 48000, 2, samplesPerBlock, 16);
-	}
-	catch (const std::runtime_error& ex)
-	{
-		cemuLog_log(LogType::Force, "Failed to initialise audio device for bootup sound");
-	}
-	audioDev->Play();
-
-	std::string sndPath = fmt::format("{}/meta/{}", CafeSystem::GetMlcStoragePath(CafeSystem::GetForegroundTitleId()), "bootSound.btsnd");
-	sint32 fscStatus = FSC_STATUS_UNDEFINED;
-	static auto bootsndFile = fsc_open(sndPath.c_str(), FSC_ACCESS_FLAG::OPEN_FILE | FSC_ACCESS_FLAG::READ_PERMISSION, &fscStatus);
-
-	static BootSoundReader reader{bootsndFile, audioBlockSize};
-
 	while (true)
 	{
         if (Latte_GetStopSignal())
@@ -516,15 +497,8 @@ void LatteShaderCache_ShowProgress(const std::function <bool(void)>& loadUpdateF
 
 		// finish frame
 		g_renderer->SwapBuffers(true, true);
-
-		if(audioDev && bootsndFile)
-		{
-			if (audioDev->NeedAdditionalBlocks())
-				audioDev->FeedBlock(reader.getSamples());
-		}
-
+		LatteThread_StreamBootSound();
 	}
-	audioDev->Stop();
 }
 
 void LatteShaderCache_LoadVulkanPipelineCache(uint64 cacheTitleId)
diff --git a/src/Cafe/HW/Latte/Core/LatteThread.cpp b/src/Cafe/HW/Latte/Core/LatteThread.cpp
index 60b32ec4..5423fbed 100644
--- a/src/Cafe/HW/Latte/Core/LatteThread.cpp
+++ b/src/Cafe/HW/Latte/Core/LatteThread.cpp
@@ -15,6 +15,9 @@
 #include "util/helpers/helpers.h"
 
 #include <imgui.h>
+#include <audio/IAudioAPI.h>
+#include <Filesystem/fsc.h>
+#include <util/bootSound/BootSoundReader.h>
 #include "config/ActiveSettings.h"
 
 #include "Cafe/CafeSystem.h"
@@ -181,6 +184,8 @@ int Latte_ThreadEntry()
 
 	// before doing anything with game specific shaders, we need to wait for graphic packs to finish loading
 	GraphicPack2::WaitUntilReady();
+
+	LatteThread_InitBootSound();
 	// load disk shader cache
     LatteShaderCache_Load();
 	// init registers
@@ -193,9 +198,11 @@ int Latte_ThreadEntry()
 		std::this_thread::yield();
 		std::this_thread::sleep_for(std::chrono::milliseconds(1));
 		LatteThread_HandleOSScreen();
+		LatteThread_StreamBootSound();
 		if (Latte_GetStopSignal())
 			LatteThread_Exit();
 	}
+	LatteThread_ShutdownBootSound();
 	gxRingBufferReadPtr = gx2WriteGatherPipe.gxRingBuffer;
 	LatteCP_ProcessRingbuffer();
 	cemu_assert_debug(false); // should never reach
@@ -262,3 +269,49 @@ void LatteThread_Exit()
 	#endif
 	cemu_assert_unimplemented();
 }
+
+AudioAPIPtr g_BootSndAudioDev = nullptr;
+std::unique_ptr<BootSoundReader> g_BootSndFileReader;
+FSCVirtualFile* g_bootSndFileHandle = 0;
+
+void LatteThread_InitBootSound()
+{
+	const sint32 samplesPerBlock = 4800;
+	const sint32 audioBlockSize = samplesPerBlock * 2 * 2;
+	try
+	{
+		g_BootSndAudioDev = IAudioAPI::CreateDeviceFromConfig(true, 48000, 2, samplesPerBlock, 16);
+	}
+	catch (const std::runtime_error& ex)
+	{
+		cemuLog_log(LogType::Force, "Failed to initialise audio device for bootup sound");
+	}
+	g_BootSndAudioDev->Play();
+
+	std::string sndPath = fmt::format("{}/meta/{}", CafeSystem::GetMlcStoragePath(CafeSystem::GetForegroundTitleId()), "bootSound.btsnd");
+	sint32 fscStatus = FSC_STATUS_UNDEFINED;
+	g_bootSndFileHandle = fsc_open(sndPath.c_str(), FSC_ACCESS_FLAG::OPEN_FILE | FSC_ACCESS_FLAG::READ_PERMISSION, &fscStatus);
+
+	g_BootSndFileReader = std::make_unique<BootSoundReader>(g_bootSndFileHandle, audioBlockSize);
+}
+
+void LatteThread_StreamBootSound()
+{
+	if(g_BootSndAudioDev && g_bootSndFileHandle && g_BootSndFileReader)
+	{
+		if (g_BootSndAudioDev->NeedAdditionalBlocks())
+			g_BootSndAudioDev->FeedBlock(g_BootSndFileReader->getSamples());
+	}
+}
+
+void LatteThread_ShutdownBootSound()
+{
+	g_BootSndFileReader.reset();
+	if(g_bootSndFileHandle)
+		fsc_close(g_bootSndFileHandle);
+	if(g_BootSndAudioDev)
+	{
+		g_BootSndAudioDev->Stop();
+		g_BootSndAudioDev.reset();
+	}
+}
\ No newline at end of file
diff --git a/src/Cafe/OS/libs/snd_core/ax_out.cpp b/src/Cafe/OS/libs/snd_core/ax_out.cpp
index 28f2f45d..87d617d2 100644
--- a/src/Cafe/OS/libs/snd_core/ax_out.cpp
+++ b/src/Cafe/OS/libs/snd_core/ax_out.cpp
@@ -418,7 +418,8 @@ namespace snd_core
 			try
 			{
 				g_padAudio = IAudioAPI::CreateDeviceFromConfig(false, 48000, snd_core::AX_SAMPLES_PER_3MS_48KHZ * AX_FRAMES_PER_GROUP, 16);
-				g_padVolume = g_padAudio->GetVolume();
+				if(g_padAudio)
+					g_padVolume = g_padAudio->GetVolume();
 			}
 			catch (std::runtime_error& ex)
 			{
diff --git a/src/audio/IAudioAPI.cpp b/src/audio/IAudioAPI.cpp
index 0cc20507..d30d9f56 100644
--- a/src/audio/IAudioAPI.cpp
+++ b/src/audio/IAudioAPI.cpp
@@ -113,6 +113,9 @@ AudioAPIPtr IAudioAPI::CreateDeviceFromConfig(bool TV, sint32 rate, sint32 chann
 	const auto audio_api = (IAudioAPI::AudioAPI)config.audio_api;
 	auto& selectedDevice = TV ? config.tv_device : config.pad_device;
 
+	if(selectedDevice.empty())
+		return {};
+
 	IAudioAPI::DeviceDescriptionPtr device_description;
 	if (IAudioAPI::IsAudioAPIAvailable(audio_api))
 	{