From e850b90ccd5b7713c7a4cbe59a1ad499cf78e092 Mon Sep 17 00:00:00 2001 From: L05 Date: Fri, 12 Apr 2019 20:25:18 -0700 Subject: [PATCH 1/5] Update OscReceiverInputKey.cpp to remove sprintf warning. --- OSC/Source/OSC/Private/Receive/OscReceiverInputKey.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.cpp b/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.cpp index 2050405..69cfc43 100644 --- a/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.cpp +++ b/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.cpp @@ -10,7 +10,7 @@ OscReceiverInputKey::OscReceiverInputKey(const FString &address) _addressName(*address) { char buffer[512]; // address truncated after 500 chars. - const auto length = sprintf(buffer, "OSC%.500s", StringCast(*address).Get()); + const auto length = sprintf_s(buffer, sizeof(buffer), "OSC%.500s", StringCast(*address).Get()); // replace '/' by '_' because '/' is not a valid FKey character. for(int i=0; i!=length; ++i) From 3132bc77779cb1f55898c19ef404c729e1c7a17a Mon Sep 17 00:00:00 2001 From: L05 Date: Tue, 18 Feb 2020 09:22:29 -0800 Subject: [PATCH 2/5] 4.24 fix (includes) --- OSC/Source/OSC/Private/OscPrivatePCH.h | 4 ++-- OSC/Source/OSC/Private/OscSettings.cpp | 2 +- OSC/Source/OSC/Private/OscSettings.h | 2 +- OSC/Source/OSC/Private/Receive/OscDispatcher.cpp | 6 +++--- OSC/Source/OSC/Private/Receive/OscDispatcher.h | 10 +++++----- OSC/Source/OSC/Private/Receive/OscReceiverInputKey.h | 4 ++-- OSC/Source/OSC/Public/Receive/OscReceiverActor.h | 4 ++-- OSC/Source/OSC/Public/Receive/OscReceiverComponent.h | 4 ++-- OSC/Source/OSC/Public/Receive/OscReceiverInterface.h | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/OSC/Source/OSC/Private/OscPrivatePCH.h b/OSC/Source/OSC/Private/OscPrivatePCH.h index 982cf0d..c959b02 100644 --- a/OSC/Source/OSC/Private/OscPrivatePCH.h +++ b/OSC/Source/OSC/Private/OscPrivatePCH.h @@ -6,10 +6,10 @@ #include "ISettingsModule.h" #include "ISettingsSection.h" -#include "ModuleManager.h" +#include "Modules/ModuleManager.h" #include "Sockets.h" #include "SocketSubsystem.h" -#include "TaskGraphInterfaces.h" +#include "Async/TaskGraphInterfaces.h" #include "Runtime/Engine/Classes/Kismet/BlueprintFunctionLibrary.h" #include "Runtime/Networking/Public/Networking.h" diff --git a/OSC/Source/OSC/Private/OscSettings.cpp b/OSC/Source/OSC/Private/OscSettings.cpp index 9a6aca1..0bc1b49 100644 --- a/OSC/Source/OSC/Private/OscSettings.cpp +++ b/OSC/Source/OSC/Private/OscSettings.cpp @@ -3,7 +3,7 @@ #include "OscSettings.h" #include "OscDispatcher.h" -#include "IPv4Endpoint.h" +#include "Interfaces/IPv4/IPv4Address.h" #include "Sockets.h" diff --git a/OSC/Source/OSC/Private/OscSettings.h b/OSC/Source/OSC/Private/OscSettings.h index deec70e..1c794c3 100644 --- a/OSC/Source/OSC/Private/OscSettings.h +++ b/OSC/Source/OSC/Private/OscSettings.h @@ -1,6 +1,6 @@ #pragma once -#include "Object.h" +#include "UObject/Object.h" #include "OscReceiverInputKey.h" #include #include diff --git a/OSC/Source/OSC/Private/Receive/OscDispatcher.cpp b/OSC/Source/OSC/Private/Receive/OscDispatcher.cpp index d3f4bac..cff5364 100644 --- a/OSC/Source/OSC/Private/Receive/OscDispatcher.cpp +++ b/OSC/Source/OSC/Private/Receive/OscDispatcher.cpp @@ -1,8 +1,8 @@ #include "OscPrivatePCH.h" #include "OscDispatcher.h" -#include "OscReceiverInterface.h" -#include "ArrayReader.h" -#include "IPv4Endpoint.h" +#include "Receive/OscReceiverInterface.h" +#include "Serialization/ArrayReader.h" +#include "Interfaces/IPv4/IPv4Address.h" #include "oscpack/osc/OscReceivedElements.h" diff --git a/OSC/Source/OSC/Private/Receive/OscDispatcher.h b/OSC/Source/OSC/Private/Receive/OscDispatcher.h index 45f5fe8..637de59 100644 --- a/OSC/Source/OSC/Private/Receive/OscDispatcher.h +++ b/OSC/Source/OSC/Private/Receive/OscDispatcher.h @@ -1,11 +1,11 @@ #pragma once -#include "Object.h" -#include "OscDataElemStruct.h" +#include "UObject/Object.h" +#include "Common/OscDataElemStruct.h" -#include "IPv4Address.h" -#include "CircularQueue.h" -#include "UdpSocketReceiver.h" +#include "Interfaces/IPv4/IPv4Address.h" +#include "Containers/CircularQueue.h" +#include "Common/UdpSocketReceiver.h" #include #include diff --git a/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.h b/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.h index b775353..5e9f81c 100644 --- a/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.h +++ b/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.h @@ -2,8 +2,8 @@ #include "InputCoreTypes.h" -#include "OscReceiverInterface.h" -#include "OscDataElemStruct.h" +#include "Receive/OscReceiverInterface.h" +#include "Common/OscDataElemStruct.h" class OscReceiverInputKey : public IOscReceiverInterface diff --git a/OSC/Source/OSC/Public/Receive/OscReceiverActor.h b/OSC/Source/OSC/Public/Receive/OscReceiverActor.h index d2caf5f..5c9f434 100644 --- a/OSC/Source/OSC/Public/Receive/OscReceiverActor.h +++ b/OSC/Source/OSC/Public/Receive/OscReceiverActor.h @@ -1,8 +1,8 @@ #pragma once #include "GameFramework/Actor.h" -#include "OscReceiverInterface.h" -#include "OscDataElemStruct.h" +#include "Receive/OscReceiverInterface.h" +#include "Common/OscDataElemStruct.h" #include "OscReceiverActor.generated.h" diff --git a/OSC/Source/OSC/Public/Receive/OscReceiverComponent.h b/OSC/Source/OSC/Public/Receive/OscReceiverComponent.h index 86c89e3..2e52db3 100644 --- a/OSC/Source/OSC/Public/Receive/OscReceiverComponent.h +++ b/OSC/Source/OSC/Public/Receive/OscReceiverComponent.h @@ -1,8 +1,8 @@ #pragma once #include "Components/ActorComponent.h" -#include "OscReceiverInterface.h" -#include "OscDataElemStruct.h" +#include "Receive/OscReceiverInterface.h" +#include "Common/OscDataElemStruct.h" #include "OscReceiverComponent.generated.h" diff --git a/OSC/Source/OSC/Public/Receive/OscReceiverInterface.h b/OSC/Source/OSC/Public/Receive/OscReceiverInterface.h index a2f318b..d64b8c2 100644 --- a/OSC/Source/OSC/Public/Receive/OscReceiverInterface.h +++ b/OSC/Source/OSC/Public/Receive/OscReceiverInterface.h @@ -1,6 +1,6 @@ #pragma once -#include "OscDataElemStruct.h" +#include "Common/OscDataElemStruct.h" /// Base class to receive OSC messages. From 4f0c98eea4f824717782675fd292128404aa5576 Mon Sep 17 00:00:00 2001 From: L05 Date: Tue, 18 Feb 2020 09:28:23 -0800 Subject: [PATCH 3/5] Update README.md with 4.24 notice --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 75c144c..0a22984 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ UE4-OSC OSC plugin for Unreal Engine 4 to send and receive OSC messages with blueprints! +*Updated to work with 4.24* + It uses oscpack, a C++ library for packing/unpacking OSC messages, by Ross Bencina. http://www.rossbencina.com/code/oscpack From bf50dab32a24b759f5c233bd1feed0a37f16b675 Mon Sep 17 00:00:00 2001 From: L05 Date: Wed, 19 Feb 2020 06:20:29 -0800 Subject: [PATCH 4/5] Revert "Update OscReceiverInputKey.cpp to remove sprintf warning." at the suggestion of monsieurgustav. This reverts commit e850b90ccd5b7713c7a4cbe59a1ad499cf78e092. --- OSC/Source/OSC/Private/Receive/OscReceiverInputKey.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.cpp b/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.cpp index 69cfc43..2050405 100644 --- a/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.cpp +++ b/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.cpp @@ -10,7 +10,7 @@ OscReceiverInputKey::OscReceiverInputKey(const FString &address) _addressName(*address) { char buffer[512]; // address truncated after 500 chars. - const auto length = sprintf_s(buffer, sizeof(buffer), "OSC%.500s", StringCast(*address).Get()); + const auto length = sprintf(buffer, "OSC%.500s", StringCast(*address).Get()); // replace '/' by '_' because '/' is not a valid FKey character. for(int i=0; i!=length; ++i) From 9953940078752a557f2bec9455ad44af371bc96f Mon Sep 17 00:00:00 2001 From: L05 Date: Wed, 19 Feb 2020 06:22:13 -0800 Subject: [PATCH 5/5] Revert "Update README.md with 4.24 notice" This reverts commit 4f0c98eea4f824717782675fd292128404aa5576. --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 0a22984..75c144c 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ UE4-OSC OSC plugin for Unreal Engine 4 to send and receive OSC messages with blueprints! -*Updated to work with 4.24* - It uses oscpack, a C++ library for packing/unpacking OSC messages, by Ross Bencina. http://www.rossbencina.com/code/oscpack