From a3bb87a4972a5a19b5127c578840f1c3466cf9fe Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 6 Mar 2021 04:01:29 -0500 Subject: [PATCH] Use in conjunction w/ RuntimeFilesDownloader causes symbol redefinition I've renamed the conflicting symbols so I can import both libraries publicly without crazy wrapper/module hijinks. --- .../Public/RuntimeAudioImporterLibrary.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RuntimeAudioImporter/Source/RuntimeAudioImporter/Public/RuntimeAudioImporterLibrary.h b/RuntimeAudioImporter/Source/RuntimeAudioImporter/Public/RuntimeAudioImporterLibrary.h index 013358a..ee47def 100644 --- a/RuntimeAudioImporter/Source/RuntimeAudioImporter/Public/RuntimeAudioImporterLibrary.h +++ b/RuntimeAudioImporter/Source/RuntimeAudioImporter/Public/RuntimeAudioImporterLibrary.h @@ -180,7 +180,7 @@ class UPreimportedSoundAsset; * * @param Percentage Percentage of importing completed (0-100%) */ -DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnProgress, const int32, Percentage); +DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnAudioProgress, const int32, Percentage); /** * Declare a delegate that will be called on the transcoding result @@ -189,7 +189,7 @@ DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnProgress, const int32, Percentage * @param ReadySoundWave Ready SoundWave object reference * @param Status TranscodingStatus Enum in case an error occurs */ -DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FOnResult, class URuntimeAudioImporterLibrary*, +DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FOnAudioResult, class URuntimeAudioImporterLibrary*, RuntimeAudioImporterObjectRef, const USoundWave*, SoundWaveRef, const TEnumAsByte < ETranscodingStatus >&, Status); @@ -206,11 +206,11 @@ public: /** Bind to know when the transcoding is on progress */ UPROPERTY(BlueprintAssignable, Category = "RuntimeAudioImporter") - FOnProgress OnProgress; + FOnAudioProgress OnProgress; /** Bind to know when the transcoding is complete (even if it fails) */ UPROPERTY(BlueprintAssignable, Category = "RuntimeAudioImporter") - FOnResult OnResult; + FOnAudioResult OnResult; /** Transcoding fill info. CPP use only */ FTranscodingFillStruct TranscodingFillInfo = FTranscodingFillStruct();