Merge pull request #224 from lucoiso/development

AzSpeech v1.6.11

AzSpeech.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
-	"Version": 27,
-	"VersionName": "1.6.10",
+	"Version": 28,
+	"VersionName": "1.6.11",
 	"FriendlyName": "AzSpeech - Voice and Text",
 	"Description": "Integrates Azure Speech Cognitive Services into the Engine by adding functions to perform recognition and synthesis via asynchronous tasks.",
 	"Category": "Game Features",

Source/AzSpeech/Private/AzSpeech.cpp

@@ -151,7 +151,7 @@ void FAzSpeechModule::StartupModule()
 #endif
 
 #if WITH_EDITOR && !AZSPEECH_SUPPORTED_PLATFORM
-    FMessageDialog::Open(EAppMsgType::Ok, FText::FromString("Currently, AzSpeech does not officially support the platform you're using/targeting. If you encounter any issue and can/want to contribute, get in touch! :)\n\nRepository Link: github.com/lucoiso/UEAzSpeech"));
+    FMessageDialog::Open(EAppMsgType::Ok, FText::FromString(TEXT("Currently, AzSpeech does not officially support the platform you're using/targeting. If you encounter any issue and can/want to contribute, get in touch! :)\n\nRepository Link: github.com/lucoiso/UEAzSpeech")));
 #endif
 }
 

Source/AzSpeech/Private/AzSpeech/AzSpeechHelper.cpp

@@ -525,7 +525,7 @@ const FAzSpeechAnimationData UAzSpeechHelper::ExtractAnimationDataFromVisemeData
     }
 
     const TSharedRef<TJsonReader<>> Reader = TJsonReaderFactory<>::Create(VisemeData.Animation);
-    TSharedPtr<FJsonObject> JsonObject = MakeShareable(new FJsonObject);
+    TSharedPtr<FJsonObject> JsonObject = MakeShared<FJsonObject>();
     FJsonSerializer::Deserialize(Reader, JsonObject);
 
     if (!JsonObject.IsValid())

Source/AzSpeech/Private/AzSpeech/AzSpeechSettings.cpp

@@ -81,7 +81,7 @@ void UAzSpeechSettings::PostEditChangeProperty(FPropertyChangedEvent& PropertyCh
 
         if (DefaultOptions.RecognitionOptions.CandidateLanguages.Num() > MaxCandidateLanguages)
         {
-            FMessageDialog::Open(EAppMsgType::Ok, FText::FromString("You can only include up to 4 languages for at-start LID and up to 10 languages for continuous LID."));
+            FMessageDialog::Open(EAppMsgType::Ok, FText::FromString(TEXT("You can only include up to 4 languages for at-start LID and up to 10 languages for continuous LID.")));
             DefaultOptions.RecognitionOptions.CandidateLanguages.RemoveAtSwap(MaxCandidateLanguages, DefaultOptions.RecognitionOptions.CandidateLanguages.Num() - MaxCandidateLanguages, true);
         }
 

Source/AzSpeech/Public/AzSpeech/Runnables/AzSpeechRecognitionRunnable.h

@@ -16,7 +16,7 @@ THIRD_PARTY_INCLUDES_END
 /**
  *
  */
-class FAzSpeechRecognitionRunnable : public FAzSpeechRunnableBase
+    class FAzSpeechRecognitionRunnable : public FAzSpeechRunnableBase
 {
 public:
     FAzSpeechRecognitionRunnable() = delete;

Source/AzSpeech/Public/AzSpeech/Runnables/AzSpeechSynthesisRunnable.h

@@ -14,7 +14,7 @@ THIRD_PARTY_INCLUDES_END
 /**
  *
  */
-class FAzSpeechSynthesisRunnable : public FAzSpeechRunnableBase
+    class FAzSpeechSynthesisRunnable : public FAzSpeechRunnableBase
 {
 public:
     FAzSpeechSynthesisRunnable() = delete;

Source/AzSpeechEditor/Private/AzSpeechEditor.cpp

@@ -3,7 +3,7 @@
 // Repo: https://github.com/lucoiso/UEAzSpeech
 
 #include "AzSpeechEditor.h"
-#include "SAzSpeechAudioGenerator.h"
+#include "Generator/SAzSpeechAudioGenerator.h"
 #include <ToolMenus.h>
 #include <Widgets/Docking/SDockTab.h>
 #include <WorkspaceMenuStructure.h>
@@ -50,8 +50,8 @@ void FAzSpeechEditorModule::RegisterMenus()
     const TSharedPtr<FWorkspaceItem> Menu = WorkspaceMenu::GetMenuStructure().GetToolsCategory()->AddGroup(LOCTEXT("AzSpeechCategory", "AzSpeech"), LOCTEXT("AzSpeechCategoryTooltip", "AzSpeech Plugin Tabs"), FSlateIcon(AppStyleName, "Icons.Package"));
 
     FGlobalTabmanager::Get()->RegisterNomadTabSpawner(AzSpeechEditorTabName, EditorTabSpawnerDelegate)
-        .SetDisplayName(FText::FromString("AzSpeech Audio Generator"))
-        .SetTooltipText(FText::FromString("Open AzSpeech Audio Generator"))
+        .SetDisplayName(FText::FromString(TEXT("AzSpeech Audio Generator")))
+        .SetTooltipText(FText::FromString(TEXT("Open AzSpeech Audio Generator")))
         .SetIcon(FSlateIcon(AppStyleName, "Icons.Plus"))
         .SetGroup(Menu.ToSharedRef());
 }

Source/AzSpeechEditor/Private/Generator/AzSpeechPropertiesGetter.cpp

@@ -0,0 +1,41 @@
+// Author: Lucas Vilas-Boas
+// Year: 2023
+// Repo: https://github.com/lucoiso/UEAzSpeech
+
+#include "AzSpeechPropertiesGetter.h"
+
+#ifdef UE_INLINE_GENERATED_CPP_BY_NAME
+#include UE_INLINE_GENERATED_CPP_BY_NAME(AzSpeechPropertiesGetter)
+#endif
+
+UAzSpeechPropertiesGetter::UAzSpeechPropertiesGetter(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer)
+{
+}
+
+void UAzSpeechPropertiesGetter::OnAvailableVoicesChanged(const TArray<FString>& Voices)
+{
+    OnAvailableVoicesUpdated.ExecuteIfBound(Voices);
+    Destroy();
+}
+
+void UAzSpeechPropertiesGetter::SynthesisCompleted(const TArray<uint8>& AudioData)
+{
+    OnAudioDataGenerated.ExecuteIfBound(AudioData);
+    Destroy();
+}
+
+void UAzSpeechPropertiesGetter::TaskFail()
+{
+    Destroy();
+}
+
+void UAzSpeechPropertiesGetter::Destroy()
+{
+    ClearFlags(RF_Standalone);
+
+#if ENGINE_MAJOR_VERSION >= 5
+    MarkAsGarbage();
+#else
+    MarkPendingKill();
+#endif
+}

Source/AzSpeechEditor/Private/Generator/AzSpeechPropertiesGetter.h

@@ -0,0 +1,35 @@
+// Author: Lucas Vilas-Boas
+// Year: 2023
+// Repo: https://github.com/lucoiso/UEAzSpeech
+
+#pragma once
+
+#include <CoreMinimal.h>
+#include <UObject/Object.h>
+#include "AzSpeechPropertiesGetter.generated.h"
+
+DECLARE_DELEGATE_OneParam(FAvailableVoicesUpdated, TArray<FString>);
+DECLARE_DELEGATE_OneParam(FAudioDataGenerated, TArray<uint8>);
+
+UCLASS(MinimalAPI, NotBlueprintable, NotPlaceable, Category = "Implementation")
+class UAzSpeechPropertiesGetter : public UObject
+{
+    GENERATED_BODY()
+
+public:
+    explicit UAzSpeechPropertiesGetter(const FObjectInitializer& ObjectInitializer = FObjectInitializer::Get());
+
+    FAvailableVoicesUpdated OnAvailableVoicesUpdated;
+    FAudioDataGenerated OnAudioDataGenerated;
+
+    UFUNCTION()
+    void OnAvailableVoicesChanged(const TArray<FString>& Voices);
+
+    UFUNCTION()
+    void SynthesisCompleted(const TArray<uint8>& AudioData);
+
+    UFUNCTION()
+    void TaskFail();
+
+    void Destroy();
+};