update to Unreal SDK Version 1.5.6

fixes Bug with Memory Management that caused interrupted Connections
4Players · Jun 28, 2023 · ff1f0e0 · ff1f0e0
1 parent 9be98f1
commit ff1f0e0
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 36 deletions.
diff --git a/Content/Blueprints/Game/GameInstance_TD.uasset b/Content/Blueprints/Game/GameInstance_TD.uasset
diff --git a/Content/Blueprints/Lobby/LobbyGameMode.uasset b/Content/Blueprints/Lobby/LobbyGameMode.uasset
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
@@ -3,7 +3,7 @@
 	"Version": 1,
 	"EngineVersion": "4.26.0",
 	"WhitelistPlatforms": [ "Win64", "Mac", "IOS", "Linux", "Android" ],
-	"VersionName": "1.5.5",
+	"VersionName": "1.5.6",
 	"FriendlyName": "4Players ODIN",
 	"Description": "Unreal integration plugin to integrate real-time chat technology into your game",
 	"Category": "Other",

diff --git a/Plugins/Odin/Source/Odin/Private/OdinAudioCapture.cpp b/Plugins/Odin/Source/Odin/Private/OdinAudioCapture.cpp
@@ -4,7 +4,6 @@
 
 #include "Async/Async.h"
 #include "Async/TaskGraphInterfaces.h"
-#include "Runtime/Launch/Resources/Version.h"
 
 #if ENGINE_MAJOR_VERSION >= 5
 #include "AudioDeviceNotificationSubsystem.h"

diff --git a/Plugins/Odin/Source/Odin/Private/OdinCaptureMedia.cpp b/Plugins/Odin/Source/Odin/Private/OdinCaptureMedia.cpp
@@ -49,8 +49,8 @@ void UOdinCaptureMedia::SetAudioCapture(UAudioCapture *audio_capture)
 
 void UOdinCaptureMedia::Reset()
 {
-    if (audio_capture_.IsValid()) {
-        audio_capture_.Reset();
+    if (nullptr != audio_capture_) {
+        audio_capture_ = nullptr;
         this->audio_generator_handle_ = {};
     }
 
@@ -63,7 +63,7 @@ void UOdinCaptureMedia::Reset()
 OdinReturnCode UOdinCaptureMedia::ResetOdinStream()
 {
     FScopeLock lock(&this->capture_generator_delegate_);
-    if (audio_capture_.IsValid())
+    if (nullptr != audio_capture_)
         this->audio_capture_->RemoveGeneratorDelegate(this->audio_generator_handle_);
 
     this->audio_generator_handle_ = {};

diff --git a/Plugins/Odin/Source/Odin/Private/OdinPlaybackMedia.cpp b/Plugins/Odin/Source/Odin/Private/OdinPlaybackMedia.cpp
@@ -52,5 +52,5 @@ void UOdinPlaybackMedia::BeginDestroy()
         odin_media_stream_destroy(this->stream_handle_);
         this->stream_handle_ = 0;
     }
-    Room.Reset();
+    Room = nullptr;
 }
diff --git a/Plugins/Odin/Source/Odin/Private/OdinRoom.AsyncNodes.cpp b/Plugins/Odin/Source/Odin/Private/OdinRoom.AsyncNodes.cpp
@@ -71,12 +71,12 @@ void UOdinRoomAddMedia::Activate()
     //     ->StartBackgroundTask();
     FFunctionGraphTask::CreateAndDispatchWhenReady(
         [=]() {
-            if (!(Room.IsValid() && CaptureMedia.IsValid()))
+            if (!(Room && CaptureMedia))
                 return;
 
-            OdinRoomHandle        room_handle = Room.IsValid() ? Room->RoomHandle() : 0;
+            OdinRoomHandle        room_handle = Room ? Room->RoomHandle() : 0;
             OdinMediaStreamHandle media_handle =
-                CaptureMedia.IsValid() ? CaptureMedia->GetMediaHandle() : 0;
+                CaptureMedia ? CaptureMedia->GetMediaHandle() : 0;
 
             auto result = odin_room_add_media(room_handle, media_handle);
 
@@ -86,7 +86,7 @@ void UOdinRoomAddMedia::Activate()
                 OnResponse.Broadcast(false);
 
             } else {
-                Room->BindCaptureMedia(CaptureMedia.Get());
+                Room->BindCaptureMedia(CaptureMedia);
 
                 OnSuccess.ExecuteIfBound(result);
                 OnResponse.Broadcast(true);
@@ -120,8 +120,8 @@ void UOdinRoomRemoveMedia::Activate()
     FFunctionGraphTask::CreateAndDispatchWhenReady(
         [=]() {
             OdinReturnCode result = -1;
-            if (Room.IsValid() && CaptureMedia.IsValid()) {
-                Room->UnbindCaptureMedia(CaptureMedia.Get());
+            if (Room && CaptureMedia) {
+                Room->UnbindCaptureMedia(CaptureMedia);
                 result = CaptureMedia->ResetOdinStream();
             }
 

diff --git a/Plugins/Odin/Source/Odin/Private/OdinRoom.cpp b/Plugins/Odin/Source/Odin/Private/OdinRoom.cpp
@@ -103,12 +103,12 @@ void UOdinRoom::UpdateAPMConfig(FOdinApmSettings apm_config)
     odin_apm_config.gain_controller              = apm_config.bGainController;
 
     if (odin_apm_config.echo_canceller) {
-        if (!submix_listener_.IsValid()) {
+        if (submix_listener_ == nullptr) {
             submix_listener_ = NewObject<UOdinSubmixListener>();
             submix_listener_->SetRoom(this->room_handle_);
         }
         submix_listener_->StartSubmixListener();
-    } else if (submix_listener_.IsValid()) {
+    } else if (submix_listener_ != nullptr) {
         submix_listener_->StopSubmixListener();
     }
 
@@ -248,7 +248,7 @@ void UOdinRoom::HandleOdinEvent(const OdinEvent event)
                 },
                 TStatId(), nullptr, ENamedThreads::GameThread);
         } break;
-        case OdinEvent_RoomUserDataChanged: {
+        case OdinEventTag::OdinEvent_RoomUserDataChanged: {
             auto          room_data_changed = event.room_user_data_changed;
             TArray<uint8> room_data{room_data_changed.room_user_data,
                                     (int)room_data_changed.room_user_data_len};
@@ -289,10 +289,10 @@ void UOdinRoom::HandleOdinEvent(const OdinEvent event)
                     if (!this->IsValidLowLevel())
                         return;
 
-                    TWeakObjectPtr<UOdinMediaBase> base_media = nullptr;
+                    UOdinMediaBase* base_media = nullptr;
                     if (medias_.Contains(media_handle)) {
                         if (medias_.RemoveAndCopyValue(media_handle, base_media)
-                            && base_media.IsValid()) {
+                            && base_media != nullptr) {
                             auto playback_media = Cast<UOdinPlaybackMedia>(base_media);
                             this->onMediaRemoved.Broadcast(peer_id, playback_media, this);
                         }
@@ -312,9 +312,9 @@ void UOdinRoom::HandleOdinEvent(const OdinEvent event)
 
                     if (!medias_.Contains(media_handle))
                         return;
-                    TWeakObjectPtr<UOdinMediaBase> media = *medias_.Find(media_handle);
-                    if (media.IsValid()) {
-                        this->onMediaActiveStateChanged.Broadcast(peer_id, media.Get(), active,
+                    UOdinMediaBase* media = *medias_.Find(media_handle);
+                    if (media) {
+                        this->onMediaActiveStateChanged.Broadcast(peer_id, media, active,
                                                                   this);
                     }
                 },

diff --git a/Plugins/Odin/Source/Odin/Private/OdinSubmixListener.cpp b/Plugins/Odin/Source/Odin/Private/OdinSubmixListener.cpp
@@ -4,6 +4,8 @@
 
 #include "OdinSubmixListener.h"
 
+#include "Odin.h"
+
 using namespace Audio;
 
 UOdinSubmixListener::UOdinSubmixListener(const class FObjectInitializer &PCIP)

diff --git a/Plugins/Odin/Source/Odin/Private/OdinSynthComponent.cpp b/Plugins/Odin/Source/Odin/Private/OdinSynthComponent.cpp
@@ -4,7 +4,6 @@
 
 #include "Engine/Engine.h"
 #include "Kismet/GameplayStatics.h"
-#include "Runtime/Launch/Resources/Version.h"
 
 #include "Odin.h"
 #include "OdinMediaSoundGenerator.h"

diff --git a/Plugins/Odin/Source/Odin/Public/OdinAudioCapture.h b/Plugins/Odin/Source/Odin/Public/OdinAudioCapture.h
@@ -5,9 +5,12 @@
 #include "AudioCapture.h"
 #include "CoreMinimal.h"
 #include "Tickable.h"
+#include "Runtime/Launch/Resources/Version.h"
+
 #if ENGINE_MAJOR_VERSION >= 5
 #include "AudioDeviceNotificationSubsystem.h"
-#endif // ENGINE_MAJOR_VERSION >= 5
+#endif
+
 #include "OdinAudioCapture.generated.h"
 
 USTRUCT(BlueprintType)

diff --git a/Plugins/Odin/Source/Odin/Public/OdinCaptureMedia.h b/Plugins/Odin/Source/Odin/Public/OdinCaptureMedia.h
@@ -26,7 +26,7 @@ class ODIN_API UOdinCaptureMedia : public UOdinMediaBase
 
     FCriticalSection capture_generator_delegate_;
     UPROPERTY(BlueprintReadOnly, Category = "Audio Capture")
-    TWeakObjectPtr<UAudioCapture> audio_capture_ = nullptr;
+    UAudioCapture* audio_capture_ = nullptr;
 
     FAudioGeneratorHandle audio_generator_handle_;
 };
diff --git a/Plugins/Odin/Source/Odin/Public/OdinPlaybackMedia.h b/Plugins/Odin/Source/Odin/Public/OdinPlaybackMedia.h
@@ -95,5 +95,5 @@ class ODIN_API UOdinPlaybackMedia : public UOdinMediaBase
     void BeginDestroy() override;
 
     UPROPERTY(BlueprintReadOnly, Category = "Room")
-    TWeakObjectPtr<UOdinRoom> Room;
+    UOdinRoom* Room;
 };
diff --git a/Plugins/Odin/Source/Odin/Public/OdinRoom.h b/Plugins/Odin/Source/Odin/Public/OdinRoom.h
@@ -58,7 +58,7 @@ class ODIN_API UOdinRoomJoin : public UBlueprintAsyncActionBase
     FJoinRoomResponsePin OnResponse;
 
     UPROPERTY()
-    TWeakObjectPtr<UOdinRoom> Room;
+    UOdinRoom* Room;
 
     FString              Url;
     FString              Token;
@@ -91,10 +91,10 @@ class ODIN_API UOdinRoomAddMedia : public UBlueprintAsyncActionBase
     FAddMediaResponsePin OnResponse;
 
     UPROPERTY()
-    TWeakObjectPtr<UOdinRoom> Room;
+    UOdinRoom* Room;
 
     UPROPERTY()
-    TWeakObjectPtr<UOdinCaptureMedia> CaptureMedia;
+    UOdinCaptureMedia* CaptureMedia;
 
     FOdinRoomAddMediaError   OnError;
     FOdinRoomAddMediaSuccess OnSuccess;
@@ -123,10 +123,10 @@ class ODIN_API UOdinRoomRemoveMedia : public UBlueprintAsyncActionBase
     FRemoveMediaResponsePin OnResponse;
 
     UPROPERTY()
-    TWeakObjectPtr<UOdinRoom> Room;
+    UOdinRoom* Room;
 
     UPROPERTY()
-    TWeakObjectPtr<UOdinCaptureMedia> CaptureMedia;
+    UOdinCaptureMedia* CaptureMedia;
 
     FOdinRoomRemoveMediaError   OnError;
     FOdinRoomRemoveMediaSuccess OnSuccess;
@@ -155,7 +155,7 @@ class ODIN_API UOdinRoomUpdatePosition : public UBlueprintAsyncActionBase
     FUpdatePositionResponsePin OnResponse;
 
     UPROPERTY()
-    TWeakObjectPtr<UOdinRoom> Room;
+    UOdinRoom* Room;
 
     FVector2D Position;
 
@@ -186,7 +186,7 @@ class ODIN_API UOdinRoomUpdatePeerUserData : public UBlueprintAsyncActionBase
     FUpdatePeerUserDataResponsePin OnResponse;
 
     UPROPERTY()
-    TWeakObjectPtr<UOdinRoom> Room;
+    UOdinRoom* Room;
 
     TArray<uint8> Data;
 
@@ -217,7 +217,7 @@ class ODIN_API UOdinRoomUpdateRoomUserData : public UBlueprintAsyncActionBase
     FUpdateRoomUserDataResponsePin OnResponse;
 
     UPROPERTY()
-    TWeakObjectPtr<UOdinRoom> Room;
+    UOdinRoom* Room;
 
     TArray<uint8> Data;
 
@@ -250,7 +250,7 @@ class ODIN_API UOdinRoomSendMessage : public UBlueprintAsyncActionBase
     FSendMessageResponsePin OnResponse;
 
     UPROPERTY()
-    TWeakObjectPtr<UOdinRoom> Room;
+    UOdinRoom* Room;
 
     TArray<uint8> Data;
     TArray<int64> Targets;
@@ -527,11 +527,11 @@ class ODIN_API UOdinRoom : public /* USceneComponent */ UObject
 
     FCriticalSection capture_medias_cs_;
     UPROPERTY(transient)
-    TArray<TWeakObjectPtr<UOdinCaptureMedia>> capture_medias_;
+    TArray<UOdinCaptureMedia*> capture_medias_;
 
     FCriticalSection medias_cs_;
     UPROPERTY(transient)
-    TMap<uint64, TWeakObjectPtr<UOdinMediaBase>> medias_;
+    TMap<uint64, UOdinMediaBase*> medias_;
 
     FCriticalSection joined_callbacks_cs_;
 
@@ -542,7 +542,7 @@ class ODIN_API UOdinRoom : public /* USceneComponent */ UObject
     void HandleOdinEvent(const OdinEvent event);
 
     UPROPERTY(transient)
-    TWeakObjectPtr<UOdinSubmixListener> submix_listener_;
+    UOdinSubmixListener* submix_listener_;
 
     friend class UOdinRoomJoin;
     friend class UOdinRoomAddMedia;

diff --git a/Plugins/Odin/Source/Odin/Public/OdinSynthComponent.h b/Plugins/Odin/Source/Odin/Public/OdinSynthComponent.h
@@ -4,6 +4,7 @@
 
 #include "Components/SynthComponent.h"
 #include "CoreMinimal.h"
+#include "Runtime/Launch/Resources/Version.h"
 
 #include "OdinPlaybackMedia.h"