Merge pull request #116 from OnionGalaxy/fix/audio

Fix/audio
OnionGalaxy · May 13, 2020 · be846c8 · be846c8
2 parents e86aaf7 + d2fd716
commit be846c8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 39 deletions.
diff --git a/Engine/Module/ModuleAudio.cpp b/Engine/Module/ModuleAudio.cpp
@@ -2,7 +2,6 @@
 #include "Main/Application.h"
 #include "Component/ComponentAudioSource.h"
 #include "Module/ModuleResourceManager.h"
-#include "ResourceManagement/Resources/SoundBank.h"
 #include <SoundEngine/AkFilePackageLowLevelIOBlocking.h>              
 CAkFilePackageLowLevelIOBlocking g_lowLevelIO;
 
@@ -43,7 +42,6 @@ bool ModuleAudio::Init()
 		APP_LOG_ERROR("Could not initialize the Sound Engine.");
 		return false;
 	}
-	init_sound_bank = SoundManager::Init();
 	if (!AK::SoundEngine::RegisterGameObj(main_sound_gameobject))
 	{
 		APP_LOG_ERROR("Unable to register the gameobject");

diff --git a/Engine/Module/ModuleAudio.h b/Engine/Module/ModuleAudio.h
@@ -32,7 +32,7 @@ class ModuleAudio : public Module
 	AkPlatformInitSettings platform_init_settings;
 	AkDeviceSettings device_settings;
 
-	std::shared_ptr<SoundBank> init_sound_bank = nullptr;
+
 };
 
 #endif //_MODULEAUDIO_H_
diff --git a/Engine/ResourceManagement/Manager/SoundManager.cpp b/Engine/ResourceManagement/Manager/SoundManager.cpp
@@ -4,6 +4,7 @@
 #include "Filesystem/PathAtlas.h"
 #include "ResourceManagement/Resources/SoundBank.h"
 
+static std::shared_ptr<SoundBank> init_sound_bank = nullptr;
 std::shared_ptr<SoundBank>  SoundManager::Init()
 {
 	//LOAD WWISE INIT
@@ -14,5 +15,9 @@ std::shared_ptr<SoundBank>  SoundManager::Init()
 
 std::shared_ptr<SoundBank> SoundManager::Load(uint32_t uuid, const FileData & resource_data)
 {
+	if (init_sound_bank == nullptr)
+	{
+		init_sound_bank = SoundManager::Init();
+	}
 	return std::make_shared<SoundBank>(uuid, resource_data.buffer, resource_data.size);
 }
diff --git a/Engine/ResourceManagement/Manager/SoundManager.h b/Engine/ResourceManagement/Manager/SoundManager.h
@@ -13,6 +13,7 @@ class SoundManager
 	~SoundManager() = default;
 	static std::shared_ptr<SoundBank> Load(uint32_t uuid, const FileData& resource_data);
 	static std::shared_ptr<SoundBank>  Init();
+
 };
 
 #endif 
diff --git a/LittleOrionEngine.vcxproj b/LittleOrionEngine.vcxproj
@@ -296,14 +296,6 @@
     <ClInclude Include="Engine\ResourceManagement\Resources\SoundBank.h" />
     <ClInclude Include="Engine\ResourceManagement\Importer\SoundImporter.h" />
     <ClInclude Include="Engine\ResourceManagement\Manager\SoundManager.h" />
-    <ClInclude Include="Libraries\include\SoundEngine\AkDefaultIOHookBlocking.h" />
-    <ClInclude Include="Libraries\include\SoundEngine\AkFileHelpers.h" />
-    <ClInclude Include="Libraries\include\SoundEngine\AkFilePackage.h" />
-    <ClInclude Include="Libraries\include\SoundEngine\AkFilePackageLowLevelIO.h" />
-    <ClInclude Include="Libraries\include\SoundEngine\AkFilePackageLowLevelIOBlocking.h" />
-    <ClInclude Include="Libraries\include\SoundEngine\AkFilePackageLUT.h" />
-    <ClInclude Include="Libraries\include\SoundEngine\AkMultipleFileLocation.h" />
-    <ClInclude Include="Libraries\include\SoundEngine\stdafx.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Engine\Actions\EditorActionAddComponent.cpp" />
@@ -460,7 +452,6 @@
     <None Include="Libraries\include\NodeEditor\imgui_bezier_math.inl" />
     <None Include="Libraries\include\NodeEditor\imgui_extra_math.inl" />
     <None Include="Libraries\include\NodeEditor\imgui_node_editor_internal.inl" />
-    <None Include="Libraries\include\SoundEngine\AkFilePackageLowLevelIO.inl" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/LittleOrionEngine.vcxproj.filters b/LittleOrionEngine.vcxproj.filters
@@ -891,30 +891,6 @@
     <ClInclude Include="Engine\ResourceManagement\Importer\SoundImporter.h">
       <Filter>Engine\ResourceManagement\Importer</Filter>
     </ClInclude>
-    <ClInclude Include="Libraries\include\SoundEngine\AkDefaultIOHookBlocking.h">
-      <Filter>Libraries\SoundEngine</Filter>
-    </ClInclude>
-    <ClInclude Include="Libraries\include\SoundEngine\AkFileHelpers.h">
-      <Filter>Libraries\SoundEngine</Filter>
-    </ClInclude>
-    <ClInclude Include="Libraries\include\SoundEngine\AkFilePackage.h">
-      <Filter>Libraries\SoundEngine</Filter>
-    </ClInclude>
-    <ClInclude Include="Libraries\include\SoundEngine\AkFilePackageLowLevelIO.h">
-      <Filter>Libraries\SoundEngine</Filter>
-    </ClInclude>
-    <ClInclude Include="Libraries\include\SoundEngine\AkFilePackageLowLevelIOBlocking.h">
-      <Filter>Libraries\SoundEngine</Filter>
-    </ClInclude>
-    <ClInclude Include="Libraries\include\SoundEngine\AkFilePackageLUT.h">
-      <Filter>Libraries\SoundEngine</Filter>
-    </ClInclude>
-    <ClInclude Include="Libraries\include\SoundEngine\AkMultipleFileLocation.h">
-      <Filter>Libraries\SoundEngine</Filter>
-    </ClInclude>
-    <ClInclude Include="Libraries\include\SoundEngine\stdafx.h">
-      <Filter>Libraries\SoundEngine</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Libraries">
@@ -1015,8 +991,5 @@
     <None Include="Libraries\include\NodeEditor\imgui_node_editor_internal.inl">
       <Filter>Libraries\NodeEditor</Filter>
     </None>
-    <None Include="Libraries\include\SoundEngine\AkFilePackageLowLevelIO.inl">
-      <Filter>Libraries\SoundEngine</Filter>
-    </None>
   </ItemGroup>
 </Project>