Merge pull request #33 from DolbyIO/develop

Merge packaging fixes
DolbyIO · Jan 12, 2023 · 3cb993b · 3cb993b
2 parents 0135faa + 8a5126c
commit 3cb993b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/DolbyIO/Config/FilterPlugin.ini b/DolbyIO/Config/FilterPlugin.ini
@@ -6,5 +6,3 @@
 ;    /README.txt
 ;    /Extras/...
 ;    /Binaries/ThirdParty/*.dll
-/Source/ThirdParty/sdk-release/lib/libd*.dylib
-/Source/ThirdParty/sdk-release/lib/model.dnr
diff --git a/DolbyIO/Source/DolbyIOModule/DolbyIOModule.Build.cs b/DolbyIO/Source/DolbyIOModule/DolbyIOModule.Build.cs
@@ -26,12 +26,13 @@ public DolbyIOModule(ReadOnlyTargetRules Target) : base(Target)
 				Path.Combine(LibDir, "dolbyio_comms_sdk.lib"),
 			});
 
-			foreach (string Dll in new string[] { "avutil-56.dll", "dvclient.dll", "dolbyio_comms_media.dll",
-				                                  "dolbyio_comms_sdk.dll" })
+			string[] Dlls =
+			    new string[] { "avutil-56.dll", "dvclient.dll", "dolbyio_comms_media.dll", "dolbyio_comms_sdk.dll" };
+			PublicDelayLoadDLLs.AddRange(Dlls);
+
+			foreach (string Dll in Dlls)
 			{
-				PublicDelayLoadDLLs.Add(Dll);
-				RuntimeDependencies.Add(Path.Combine("$(PluginDir)/Binaries/Win64", Dll),
-				                        Path.Combine(SdkDir, "bin", Dll));
+				RuntimeDependencies.Add(Path.Combine(SdkDir, "bin", Dll));
 			}
 		}
 		else if (Target.Platform == UnrealTargetPlatform.Mac)
@@ -44,6 +45,7 @@ public DolbyIOModule(ReadOnlyTargetRules Target) : base(Target)
 				Path.Combine(LibDir, "libdvclient.dylib"),
 			};
 			PublicAdditionalLibraries.AddRange(Libs);
+			PublicDelayLoadDLLs.AddRange(Libs);
 
 			foreach (string Lib in Libs)
 			{

diff --git a/DolbyIO/Source/DolbyIOModule/Private/DolbyIO/DolbyIOModule.cpp b/DolbyIO/Source/DolbyIOModule/Private/DolbyIO/DolbyIOModule.cpp
@@ -15,10 +15,14 @@ namespace DolbyIO
 		void StartupModule() override
 		{
 #if PLATFORM_WINDOWS
-			LoadDll("avutil-56.dll");
-			LoadDll("dvclient.dll");
-			LoadDll("dolbyio_comms_media.dll");
-			LoadDll("dolbyio_comms_sdk.dll");
+			LoadDll("bin/avutil-56.dll");
+			LoadDll("bin/dvclient.dll");
+			LoadDll("bin/dolbyio_comms_media.dll");
+			LoadDll("bin/dolbyio_comms_sdk.dll");
+#elif PLATFORM_MAC
+			LoadDll("lib/libdolbyio_comms_media.dylib");
+			LoadDll("lib/libdolbyio_comms_sdk.dylib");
+			LoadDll("lib/libdvclient.dylib");
 #endif
 		}
 
@@ -33,8 +37,8 @@ namespace DolbyIO
 	private:
 		void LoadDll(const FString& Dll)
 		{
-			const static auto BaseDir =
-			    FPaths::Combine(*IPluginManager::Get().FindPlugin("DolbyIO")->GetBaseDir(), TEXT("Binaries/Win64"));
+			const static auto BaseDir = FPaths::Combine(*IPluginManager::Get().FindPlugin("DolbyIO")->GetBaseDir(),
+			                                            TEXT("Source/ThirdParty/sdk-release"));
 			if (const auto Handle = FPlatformProcess::GetDllHandle(*FPaths::Combine(*BaseDir, *Dll)))
 			{
 				DllHandles.Add(Handle);

diff --git a/DolbyIO/Source/DolbyIOModule/Private/DolbyIO/SdkAccess.h b/DolbyIO/Source/DolbyIOModule/Private/DolbyIO/SdkAccess.h
@@ -65,8 +65,8 @@ namespace DolbyIO
 		float SpatialEnvironmentScale = 1.0f;
 
 		bool bIsAlive = true;
-		bool bIsInputMuted;
-		bool bIsOutputMuted;
+		bool bIsInputMuted = false;
+		bool bIsOutputMuted = false;
 		bool bIsDemo;
 	};
 }