Develop

DolbyIO/DolbyIO.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "1.2.0-beta.4",
+	"VersionName": "1.2.0-beta.5",
 	"FriendlyName": "Dolby.io Virtual Worlds",
 	"Description": "Plugin integrating Dolby.io Communications.",
 	"Category": "Communications",

DolbyIO/Source/Private/Subsystem/DolbyIOInitialization.cpp

@@ -12,6 +12,9 @@
 
 #include "Engine/GameInstance.h"
 #include "Engine/World.h"
+#include "GenericPlatform/GenericPlatformProperties.h"
+#include "Interfaces/IPluginManager.h"
+#include "Misc/EngineVersion.h"
 #include "Misc/Paths.h"
 #include "TimerManager.h"
 
@@ -37,6 +40,13 @@ void UDolbyIOSubsystem::Initialize(FSubsystemCollectionBase& Collection)
 	BroadcastEvent(OnTokenNeeded);
 }
 
+void UDolbyIOSubsystem::Deinitialize()
+{
+	Sdk.Reset(); // make sure Sdk is dead so it doesn't call handle_frame on VideoSink during game destruction
+
+	Super::Deinitialize();
+}
+
 void UDolbyIOSubsystem::SetLogSettings(EDolbyIOLogLevel SdkLogLevel, EDolbyIOLogLevel MediaLogLevel,
                                        EDolbyIOLogLevel DvcLogLevel)
 {
@@ -105,7 +115,12 @@ void UDolbyIOSubsystem::Initialize(const FString& Token)
 #define DLB_REGISTER_HANDLER(Service, Event) \
 	[this](event_handler_id) { return Sdk->Service().add_event_handler([this](const Event& Event) { Handle(Event); }); }
 
-	Sdk->register_component_version("unreal-sdk", "1.2.0-beta.4")
+	const FString ComponentName = "unreal-sdk";
+	const FString ComponentVersion = *IPluginManager::Get().FindPlugin("DolbyIO")->GetDescriptor().VersionName +
+	                                 FString{"_UE"} + FEngineVersion::Current().ToString(EVersionComponent::Minor) +
+	                                 "_" + FPlatformProperties::IniPlatformName();
+	DLB_UE_LOG("Registering component %s %s", *ComponentName, *ComponentVersion);
+	Sdk->register_component_version(ToStdString(ComponentName), ToStdString(ComponentVersion))
 	    .then(
 	        [this](sdk::component_data)
 	        {

DolbyIO/Source/Public/DolbyIO.h

@@ -322,6 +322,7 @@ class DOLBYIO_API UDolbyIOSubsystem : public UGameInstanceSubsystem
 
 private:
 	void Initialize(FSubsystemCollectionBase&) override;
+	void Deinitialize() override;
 
 	bool CanConnect(const FDolbyIOOnErrorDelegate&) const;
 	bool IsConnected() const;