update to Odin Unreal SDK Version 1.5.5

4Players · Jun 23, 2023 · 9be98f1 · 9be98f1
1 parent 9b0e419
commit 9be98f1
Show file tree

Hide file tree

Showing 38 changed files with 1,282 additions and 408 deletions.
diff --git a/Content/Maps/Lobby.umap b/Content/Maps/Lobby.umap
diff --git a/Content/Maps/TopDownExampleMap.umap b/Content/Maps/TopDownExampleMap.umap
diff --git a/Plugins/Odin/Odin.uplugin b/Plugins/Odin/Odin.uplugin
@@ -2,8 +2,8 @@
 	"FileVersion": 2,
 	"Version": 1,
 	"EngineVersion": "4.26.0",
-	"WhitelistPlatforms": [ "Win64", "Mac", "Linux", "Android" ],
-	"VersionName": "1.3.3",
+	"WhitelistPlatforms": [ "Win64", "Mac", "IOS", "Linux", "Android" ],
+	"VersionName": "1.5.5",
 	"FriendlyName": "4Players ODIN",
 	"Description": "Unreal integration plugin to integrate real-time chat technology into your game",
 	"Category": "Other",
@@ -21,7 +21,7 @@
 			"Name": "Odin",
 			"Type": "Runtime",
 			"LoadingPhase": "PostConfigInit",
-			"WhitelistPlatforms": [ "Win64", "Mac", "Linux", "Android" ],
+			"WhitelistPlatforms": [ "Win64", "Mac", "IOS", "Linux", "Android" ],
 			"AdditionalDependencies": [
 				"AudioMixer",
 				"AudioCapture"
@@ -32,7 +32,7 @@
 		{
 			"Name": "AudioCapture",
 			"Enabled": true,
-			"WhitelistPlatforms": [ "Win64", "Mac", "Linux", "Android" ]
+			"WhitelistPlatforms": [ "Win64", "Mac", "IOS", "Linux", "Android" ]
 		}
 	]
 }
diff --git a/Plugins/Odin/Source/Odin/Odin.Build.cs b/Plugins/Odin/Source/Odin/Odin.Build.cs
@@ -1,4 +1,4 @@
-/* Copyright (c) 2022 4Players GmbH. All rights reserved. */
+/* Copyright (c) 2022-2023 4Players GmbH. All rights reserved. */
 
 using System.IO;
 
@@ -9,25 +9,32 @@ public class Odin : ModuleRules
   public Odin(ReadOnlyTargetRules Target) : base(Target)
   {
     PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
+    PrecompileForTargets = PrecompileTargetsType.Any;
 
+    // List of all paths to include files that are exposed to other modules
     PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "Public"));
 
+    // List of all paths to this module's internal include files, not exposed to other modules
     PrivateIncludePaths.Add(Path.Combine(ModuleDirectory, "Private"));
 
+    // Enable warnings for using undefined identifiers in #if expressions
+    bEnableUndefinedIdentifierWarnings = false;
+
+    // List of public dependency module names
     PublicDependencyModuleNames.AddRange(
       new string[]
       {
-        "Core",
-        "CoreUObject",
-        "Engine",
-        "AudioMixer",
-        "SignalProcessing",
-        "AudioCapture",
-        "Json",
-        "JsonUtilities",
-        "OdinLibrary",
-        "Projects",
+            "Core",
+            "CoreUObject",
+            "Engine",
+            "AudioMixer",
+            "SignalProcessing",
+            "AudioCapture",
+            "Json",
+            "JsonUtilities",
+            "OdinLibrary",
+            "Projects", "AudioCaptureCore",
       }
-      );
+  );
   }
 }
diff --git a/Plugins/Odin/Source/Odin/Private/Odin.cpp b/Plugins/Odin/Source/Odin/Private/Odin.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2022 4Players GmbH. All rights reserved. */
+/* Copyright (c) 2022-2023 4Players GmbH. All rights reserved. */
 
 #include "Odin.h"
 #include "CoreMinimal.h"
@@ -7,10 +7,14 @@
 #include "Misc/Paths.h"
 #include "Modules/ModuleManager.h"
 
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_IOS || PLATFORM_LINUX
 #include "HAL/PlatformProcess.h"
 #endif
 
+#if PLATFORM_IOS
+#include "IOSAppDelegate.h"
+#endif
+
 #include "OdinCore/include/odin.h"
 
 #define LOCTEXT_NAMESPACE "FOdinModule"
@@ -19,13 +23,18 @@ DEFINE_LOG_CATEGORY(Odin)
 
 void FOdinModule::StartupModule()
 {
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
+#if PLATFORM_IOS
+    [[IOSAppDelegate GetDelegate] SetFeature:EAudioFeature::Playback Active:true];
+    [[IOSAppDelegate GetDelegate] SetFeature:EAudioFeature::Record Active:true];
+    [[IOSAppDelegate GetDelegate] SetFeature:EAudioFeature::VoiceChat Active:true];
+#endif
+
+#if PLATFORM_WINDOWS || PLATFORM_LINUX
     FString BaseDir = IPluginManager::Get().FindPlugin("Odin")->GetBaseDir();
     FString LibraryPath;
     FString libraryName;
 
     FString PlatformArchitecture;
-
 #if PLATFORM_CPU_X86_FAMILY
     PlatformArchitecture = "x64";
 #elif PLATFORM_CPU_ARM_FAMILY
@@ -40,10 +49,6 @@ void FOdinModule::StartupModule()
     LibraryPath =
         FPaths::Combine(*BaseDir, TEXT("Source/OdinCore"), PlatformArchitecture, TEXT("Linux"));
     libraryName = "libodin.so";
-#elif PLATFORM_MAC
-    LibraryPath =
-        FPaths::Combine(*BaseDir, TEXT("Source/OdinCore"), PlatformArchitecture, TEXT("Mac"));
-    libraryName = "libodin.dylib";
 #endif
 
     FPlatformProcess::PushDllDirectory(*LibraryPath);
@@ -58,14 +63,19 @@ void FOdinModule::StartupModule()
         UE_LOG(Odin, Log, TEXT("Loaded Library (%s)"), *(LibraryPath / libraryName));
     }
 #endif
-    odin_startup(ODIN_VERSION);
+
+    auto sample_rate   = 48000;
+    auto channel_count = 2;
+
+    odin_startup_ex(ODIN_VERSION,
+                    OdinAudioStreamConfig{(uint32_t)sample_rate, (uint8_t)channel_count});
 }
 
 void FOdinModule::ShutdownModule()
 {
     odin_shutdown();
 
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
+#if PLATFORM_WINDOWS || PLATFORM_LINUX
     FPlatformProcess::FreeDllHandle(OdinLibraryHandle);
     OdinLibraryHandle = nullptr;
 #endif