Merge pull request #218 from lucoiso/development

clear empty lines + add include

Source/AzSpeech/AzSpeech.Build.cs

@@ -42,4 +42,4 @@ public AzSpeech(ReadOnlyTargetRules Target) : base(Target)
 
 		PrivateIncludePathModuleNames.Add("DesktopPlatform");
 	}
-}
+}

Source/AzSpeech/Private/AzSpeech/AzSpeechHelper.cpp

@@ -24,6 +24,7 @@
 #include <Serialization/JsonReader.h>
 #include <Serialization/JsonSerializer.h>
 #include <Dom/JsonObject.h>
+#include <Misc/PackageName.h>
 
 #if WITH_EDITORONLY_DATA
 #include <EditorFramework/AssetImportData.h>

Source/AzSpeech/Public/AzSpeech/AzSpeechHelper.h

@@ -46,12 +46,12 @@ class AZSPEECH_API UAzSpeechHelper final : public UBlueprintFunctionLibrary
 		return QualifyFileExtension(Path, Name, "xml");
 	}
 
-	/* 
+	/*
 		Convert .wav file to USoundWave.
 
 		[OutputModule, RelativeOutputDirectory, OutputAssetName]: Used to save the generated audio data in project's content. Set empty values to generate a transient Sound Wave
 
-		OutputModule: Name of the module that will be used to save the generated audio data in project's content. Example: Game. 
+		OutputModule: Name of the module that will be used to save the generated audio data in project's content. Example: Game.
 		RelativeOutputDirectory: Directory where the sound wave will be saved
 		OutputAssetName: Name of the generated Sound Wave
 
@@ -60,12 +60,12 @@ class AZSPEECH_API UAzSpeechHelper final : public UBlueprintFunctionLibrary
 	UFUNCTION(BlueprintCallable, Category = "AzSpeech | Audio", Meta = (DisplayName = "Convert .wav file to USoundWave"))
 	static USoundWave* ConvertWavFileToSoundWave(const FString& FilePath, const FString& FileName, const FString& OutputModule = "", const FString& RelativeOutputDirectory = "", const FString& OutputAssetName = "");
 
-	/* 
+	/*
 		Convert audio data (TArray<uint8>) to USoundWave.
 
 		[OutputModule, RelativeOutputDirectory, OutputAssetName]: Used to save the generated audio data in project's content. Set empty values to generate a transient Sound Wave
 
-		OutputModule: Name of the module that will be used to save the generated audio data in project's content. Example: Game. 
+		OutputModule: Name of the module that will be used to save the generated audio data in project's content. Example: Game.
 		RelativeOutputDirectory: Directory where the sound wave will be saved
 		OutputAssetName: Name of the generated Sound Wave
 
@@ -117,7 +117,7 @@ class AZSPEECH_API UAzSpeechHelper final : public UBlueprintFunctionLibrary
 	/* Check if the content module is available */
 	UFUNCTION(BlueprintPure, Category = "AzSpeech | Utils")
 	static const bool IsContentModuleAvailable(const FString& ModuleName);
-		
+
 	/* Get AzSpeech Friendly Name */
 	UFUNCTION(BlueprintPure, Category = "AzSpeech | Utils")
 	static const FString GetPluginFriendlyName();
@@ -126,28 +126,28 @@ class AZSPEECH_API UAzSpeechHelper final : public UBlueprintFunctionLibrary
 	UFUNCTION(BlueprintPure, Category = "AzSpeech | Utils")
 	static const FString GetPluginVersion();
 
-	/* 
+	/*
 		Extract the Animation JSON property from Viseme Data.
 
 		JSON Body Format:
 		[
 			FrameIndex: Integer,
-			BlendShapes: [ 
-				[ 
-					Number, 
-					... 
-				], 
-				[ 
-					Number, 
-					... 
-				], 
-				... 
+			BlendShapes: [
+				[
+					Number,
+					...
+				],
+				[
+					Number,
+					...
+				],
+				...
 			]
 		]
 	*/
 	UFUNCTION(BlueprintPure, Category = "AzSpeech | Data")
 	static const FAzSpeechAnimationData ExtractAnimationDataFromVisemeData(const FAzSpeechVisemeData& VisemeData);
-	
+
 	/*
 		Extract the Animation JSON property from Viseme Data Array.
 

Source/AzSpeech/Public/AzSpeech/AzSpeechSettings.h

@@ -12,7 +12,7 @@
 #include "AzSpeechSettings.generated.h"
 
 /**
- * 
+ *
  */
 UCLASS(Config = Plugins, DefaultConfig, meta = (DisplayName="AzSpeech"))
 class AZSPEECH_API UAzSpeechSettings final : public UDeveloperSettings
@@ -37,8 +37,8 @@ class AZSPEECH_API UAzSpeechSettings final : public UDeveloperSettings
 
 	/* Thread update interval: Sleep time between task update checks */
 	UPROPERTY(GlobalConfig, EditAnywhere, Category = "Thread", Meta = (DisplayName = "Thread Update Interval", ClampMin = "0.0001", UIMin = "0.0001", ClampMax = "1", UIMax = "1"))
-	float ThreadUpdateInterval;	
-	
+	float ThreadUpdateInterval;
+
 	/* If enabled, SSML synthesizers tasks with viseme output type set to FacialExpression will return only data that contains the Animation property */
 	UPROPERTY(GlobalConfig, EditAnywhere, Category = "Information", Meta = (DisplayName = "Filter Viseme Facial Expression"))
 	bool bFilterVisemeFacialExpression;
@@ -54,7 +54,7 @@ class AZSPEECH_API UAzSpeechSettings final : public UDeveloperSettings
 	/* Will print extra debugging informations in log */
 	UPROPERTY(GlobalConfig, EditAnywhere, Category = "Information", Meta = (DisplayName = "Enable Debugging Logs"))
 	bool bEnableDebuggingLogs;
-	
+
 	/* Will print extra debugging informations in screen */
 	UPROPERTY(GlobalConfig, EditAnywhere, Category = "Information", Meta = (DisplayName = "Enable Debugging Prints"))
 	bool bEnableDebuggingPrints;

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

@@ -16,9 +16,9 @@ THIRD_PARTY_INCLUDES_END
 /**
  *
  */
-	
+
 class FAzSpeechRecognitionRunnable : public FAzSpeechRunnableBase
-{		
+{
 public:
 	FAzSpeechRecognitionRunnable() = delete;
 	FAzSpeechRecognitionRunnable(UAzSpeechTaskBase* InOwningTask, const std::shared_ptr<Microsoft::CognitiveServices::Speech::Audio::AudioConfig>& InAudioConfig);

Source/AzSpeech/Public/AzSpeech/Structures/AzSpeechAnimationData.h

@@ -13,7 +13,7 @@ struct AZSPEECH_API FAzSpeechBlendShapes
 	GENERATED_BODY()
 
 	FAzSpeechBlendShapes() = default;
-		
+
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "AzSpeech")
 	TArray<float> Data;
 };
@@ -22,12 +22,12 @@ USTRUCT(BlueprintType, Category = "AzSpeech")
 struct AZSPEECH_API FAzSpeechAnimationData
 {
 	GENERATED_BODY()
-		
+
 	FAzSpeechAnimationData() = default;
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "AzSpeech")
 	int32 FrameIndex = 0;
-	
+
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "AzSpeech")
 	TArray<FAzSpeechBlendShapes> BlendShapes;
 };

Source/AzSpeech/Public/AzSpeech/Structures/AzSpeechAudioInputDeviceInfo.h

@@ -39,7 +39,7 @@ struct AZSPEECH_API FAzSpeechAudioInputDeviceInfo
 
 		return Output;
 	}
-	
+
 	const FString GetAudioInputDeviceEndpointID() const
 	{
 		// {0.0.1.00000000}.{Device ID}

Source/AzSpeech/Public/AzSpeech/Structures/AzSpeechRecognitionMap.h

@@ -11,7 +11,7 @@ USTRUCT(BlueprintType, Category = "AzSpeech")
 struct AZSPEECH_API FAzSpeechRecognitionData
 {
 	GENERATED_BODY()
-	
+
 	FAzSpeechRecognitionData() : Value(0), Weight(1) {};
 	FAzSpeechRecognitionData(const int32 InValue) : Value(InValue) {};
 	FAzSpeechRecognitionData(const int32 InValue, const int32 InWeight) : Value(InValue), Weight(InWeight) {};

Source/AzSpeech/Public/AzSpeech/Structures/AzSpeechSettingsOptions.h

@@ -123,7 +123,6 @@ struct AZSPEECH_API FAzSpeechRecognitionOptions
 	void SetDefaults();
 };
 
-
 USTRUCT(BlueprintType, Category = "AzSpeech")
 struct AZSPEECH_API FAzSpeechSynthesisOptions
 {
@@ -167,16 +166,16 @@ USTRUCT(BlueprintType, Category = "AzSpeech")
 struct AZSPEECH_API FAzSpeechSettingsOptions
 {
 	GENERATED_BODY()
-		
+
 public:
 	FAzSpeechSettingsOptions();
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Azure", Meta = (DisplayName = "Subscription Options"))
 	FAzSpeechSubscriptionOptions SubscriptionOptions;
-	
+
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Azure", Meta = (DisplayName = "Recognition Options"))
 	FAzSpeechRecognitionOptions RecognitionOptions;
-	
+
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Azure", Meta = (DisplayName = "Synthesis Options"))
 	FAzSpeechSynthesisOptions SynthesisOptions;
 

Source/AzSpeech/Public/AzSpeech/Tasks/Bases/AzSpeechAudioDataSynthesisBase.h

@@ -15,7 +15,7 @@ UCLASS(Abstract, NotPlaceable, Category = "AzSpeech", meta = (ExposedAsyncProxy
 class AZSPEECH_API UAzSpeechAudioDataSynthesisBase : public UAzSpeechSynthesizerTaskBase
 {
 	GENERATED_BODY()
-	
+
 protected:
 	virtual bool StartAzureTaskWork() override;
 

Source/AzSpeech/Public/AzSpeech/Tasks/Bases/AzSpeechRecognizerTaskBase.h

@@ -25,8 +25,8 @@ class AZSPEECH_API UAzSpeechRecognizerTaskBase : public UAzSpeechTaskBase
 	GENERATED_BODY()
 
 	friend class FAzSpeechRecognitionRunnable;
-	
-public:	
+
+public:
 	/* Task delegate that will be called when completed */
 	UPROPERTY(BlueprintAssignable, Category = "AzSpeech")
 	FRecognitionCompletedDelegate RecognitionCompleted;
@@ -55,11 +55,11 @@ class AZSPEECH_API UAzSpeechRecognizerTaskBase : public UAzSpeechTaskBase
 
 	UFUNCTION(BlueprintPure, Category = "AzSpeech")
 	const int32 GetRecognitionLatency() const;
-	
+
 protected:
 	FName PhraseListGroup = NAME_None;
 	FAzSpeechRecognitionOptions RecognitionOptions;
-	
+
 	void StartRecognitionWork(const std::shared_ptr<Microsoft::CognitiveServices::Speech::Audio::AudioConfig>& InAudioConfig);
 
 	virtual void BroadcastFinalResult() override;

Source/AzSpeech/Public/AzSpeech/Tasks/Bases/AzSpeechSpeechSynthesisBase.h

@@ -31,7 +31,7 @@ class AZSPEECH_API UAzSpeechSpeechSynthesisBase : public UAzSpeechAudioDataSynth
 
 	UFUNCTION()
 	void OnAudioPlayStateChanged(const EAudioComponentPlayState PlayState);
-	
+
 private:
 	TWeakObjectPtr<class UAudioComponent> AudioComponent;
 };

Source/AzSpeech/Public/AzSpeech/Tasks/Bases/AzSpeechSynthesizerTaskBase.h

@@ -32,7 +32,7 @@ class AZSPEECH_API UAzSpeechSynthesizerTaskBase : public UAzSpeechTaskBase
 
 	friend class FAzSpeechSynthesisRunnable;
 
-public:	
+public:
 	/* Task delegate that will be called when dpdated */
 	UPROPERTY(BlueprintAssignable, Category = "AzSpeech")
 	FAzSpeechTaskGenericDelegate SynthesisUpdated;
@@ -96,16 +96,16 @@ class AZSPEECH_API UAzSpeechSynthesizerTaskBase : public UAzSpeechTaskBase
 
 	UFUNCTION(BlueprintPure, Category = "AzSpeech")
 	const int32 GetServiceLatency() const;
-	
+
 protected:
 	FString SynthesisText;
 	FAzSpeechSynthesisOptions SynthesisOptions;
-	
+
 	void StartSynthesisWork(const std::shared_ptr<Microsoft::CognitiveServices::Speech::Audio::AudioConfig>& InAudioConfig);
-	
+
 	virtual void OnVisemeReceived(const FAzSpeechVisemeData& VisemeData);
 	virtual void OnSynthesisUpdate(const std::shared_ptr<Microsoft::CognitiveServices::Speech::SpeechSynthesisResult>& LastResult);
-	
+
 private:
 	std::vector<uint8_t> AudioData;
 	TArray<FAzSpeechVisemeData> VisemeDataArray;

Source/AzSpeech/Public/AzSpeech/Tasks/Bases/AzSpeechTaskBase.h

@@ -111,7 +111,7 @@ class AZSPEECH_API UAzSpeechTaskStatus final : public UBlueprintFunctionLibrary
 	static bool IsTaskActive(const UAzSpeechTaskBase* Test);
 
 	UFUNCTION(BlueprintPure, Category = "AzSpeech")
-	static bool IsTaskReadyToDestroy(const UAzSpeechTaskBase* Test);	
+	static bool IsTaskReadyToDestroy(const UAzSpeechTaskBase* Test);
 
 	UFUNCTION(BlueprintPure, Category = "AzSpeech")
 	static bool IsTaskStillValid(const UAzSpeechTaskBase* Test);

Source/AzSpeech/Public/AzSpeech/Tasks/Bases/AzSpeechWavFileSynthesisBase.h

@@ -20,8 +20,8 @@ class AZSPEECH_API UAzSpeechWavFileSynthesisBase : public UAzSpeechSynthesizerTa
 	/* Task delegate that will be called when completed */
 	UPROPERTY(BlueprintAssignable, Category = "AzSpeech")
 	FBooleanSynthesisDelegate SynthesisCompleted;
-	
-	virtual void Activate() override;	
+
+	virtual void Activate() override;
 	virtual void SetReadyToDestroy() override;
 
 protected:

Source/AzSpeech/Public/AzSpeech/Tasks/RecognitionMapCheckAsync.h

@@ -47,7 +47,7 @@ class AZSPEECH_API URecognitionMapCheckAsync : public UBlueprintAsyncActionBase
 	void BroadcastResult(const int32 Result);
 	const int32 CheckRecognitionResult() const;
 	const bool CheckStringContains(const FString& KeyType, const FString& Key) const;
-	
+
 	const FName GetStringDelimiters() const;
 	const bool CheckStringDelimiters(const int32 Index) const;
 

Source/AzSpeech/Public/AzSpeech/Tasks/SSMLToAudioDataAsync.h

@@ -32,7 +32,7 @@ class AZSPEECH_API USSMLToAudioDataAsync : public UAzSpeechAudioDataSynthesisBas
 	/* Creates a SSML-To-AudioData task that will convert your SSML file to a audio data */
 	UFUNCTION(BlueprintCallable, Category = "AzSpeech | Custom", meta = (BlueprintInternalUseOnly = "true", WorldContext = "WorldContextObject", DisplayName = "SSML To Audio Data with Custom Options"))
 	static USSMLToAudioDataAsync* SSMLToAudioData_CustomOptions(UObject* WorldContextObject, const FAzSpeechSubscriptionOptions SubscriptionOptions, const FAzSpeechSynthesisOptions SynthesisOptions, const FString& SynthesisSSML);
-	
+
 protected:
 	virtual void BroadcastFinalResult() override;
 };

Source/AzSpeech/Public/AzSpeech/Tasks/SpeechToTextAsync.h

@@ -26,13 +26,13 @@ class AZSPEECH_API USpeechToTextAsync : public UAzSpeechRecognizerTaskBase
 	static USpeechToTextAsync* SpeechToText_CustomOptions(UObject* WorldContextObject, const FAzSpeechSubscriptionOptions SubscriptionOptions, const FAzSpeechRecognitionOptions RecognitionOptions, const FString& AudioInputDeviceID = "Default", const FName PhraseListGroup = NAME_None);
 
 	virtual void Activate() override;
-	
+
 	UFUNCTION(BlueprintPure, Category = "AzSpeech")
 	bool IsUsingDefaultAudioInputDevice() const;
 
 protected:
 	virtual bool StartAzureTaskWork() override;
-	
+
 private:
 	FString AudioInputDeviceID;
 };

Source/AzSpeech/Public/AzSpeech/Tasks/WavFileToTextAsync.h

@@ -29,7 +29,7 @@ class AZSPEECH_API UWavFileToTextAsync : public UAzSpeechRecognizerTaskBase
 
 protected:
 	virtual bool StartAzureTaskWork() override;
-	
+
 private:
 	FString FilePath;
 	FString FileName;

Source/AzSpeechEditor/AzSpeechEditor.Build.cs

@@ -31,4 +31,4 @@ public AzSpeechEditor(ReadOnlyTargetRules Target) : base(Target)
             "WorkspaceMenuStructure"
         });
     }
-}
+}

Source/AzSpeechEditor/Private/AzSpeechEditor.cpp

@@ -48,7 +48,7 @@ void FAzSpeechEditorModule::RegisterMenus()
 #endif
 
 	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"))
@@ -57,5 +57,5 @@ void FAzSpeechEditorModule::RegisterMenus()
 }
 
 #undef LOCTEXT_NAMESPACE
-	
+
 IMPLEMENT_MODULE(FAzSpeechEditorModule, AzSpeechEditor)

Source/AzSpeechEditor/Private/SAzSpeechAudioGenerator.cpp

@@ -335,4 +335,4 @@ void SAzSpeechAudioGenerator::OnFileInfoCommited(const FText& InText, FString& M
 	Member = FPaths::MakeValidFileName(NewValue);
 
 	InputRef->SetText(FText::FromString(Member));
-}
+}

Source/AzSpeechEditor/Private/SAzSpeechAudioGenerator.h

@@ -17,7 +17,7 @@ class UAzSpeechPropertiesGetter : public UObject
 
 public:
 	explicit UAzSpeechPropertiesGetter(const FObjectInitializer& ObjectInitializer = FObjectInitializer::Get());
-	
+
 	FAvailableVoicesUpdated OnAvailableVoicesUpdated;
 	FAudioDataGenerated OnAudioDataGenerated;
 

Source/ThirdParty/AzureWrapper/AzureWrapper.Build.cs

@@ -255,4 +255,4 @@ public AzureWrapper(ReadOnlyTargetRules Target) : base(Target)
 			AdditionalPropertiesForReceipt.Add("AndroidPlugin", Path.Combine(ModuleDirectory, "AzSpeech_UPL_Android.xml"));
 		}
 	}
-}
+}