storytold/UE4-OSC
2
0
Fork 0
mirror of https://github.com/storytold/UE4-OSC.git synced 2026-10-24 08:15:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

breaking change: SendOsc "Address" parameter is now an FName

Browse Source
This commit is contained in:
monsieurgustav
2014-11-23 13:59:53 +01:00
parent 72fc81ce3e
commit f3474cb760
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OSC/Source/OSC/Private/Common/OscFunctionLibrary.cpp
+16 -5
View File
@@ -63,22 +63,33 @@ void UOscFunctionLibrary::PushInt(FOscDataStruct input, int32 Value, FOscDataStr
void UOscFunctionLibrary::PushString(FOscDataStruct input, FName Value, FOscDataStruct & output) void UOscFunctionLibrary::PushString(FOscDataStruct input, FName Value, FOscDataStruct & output)
{ {
if(Value.GetDisplayNameEntry()->IsWide())
{
const auto tmp = Value.GetPlainNameString();
UE_LOG(LogOSC, Error, TEXT("Invalid string argument \"%s\": ASCII only"), *tmp);
return;
}
output = input; output = input;
FOscDataElemStruct elem; FOscDataElemStruct elem;
elem.SetString(Value); elem.SetString(Value);
output.Queue.Add(elem); output.Queue.Add(elem);
} }
void UOscFunctionLibrary::SendOsc(const FString & Address, const FOscDataStruct & Data, int32 TargetIndex) void UOscFunctionLibrary::SendOsc(FName Address, const FOscDataStruct & Data, int32 TargetIndex)
{ {
if(Address.GetDisplayNameEntry()->IsWide())
{
const auto tmp = Address.GetPlainNameString();
UE_LOG(LogOSC, Error, TEXT("Invalid OSC address \"%s\": ASCII only"), *tmp);
return;
}
static_assert(sizeof(uint8) == sizeof(char), "Cannot cast uint8 to char"); static_assert(sizeof(uint8) == sizeof(char), "Cannot cast uint8 to char");
uint8 buffer[1024]; uint8 buffer[1024];
char oscAddress[256];
strcpy(oscAddress, TCHAR_TO_ANSI(*Address));
osc::OutboundPacketStream output((char *)buffer, sizeof(buffer)); osc::OutboundPacketStream output((char *)buffer, sizeof(buffer));
output << osc::BeginMessage(oscAddress); output << osc::BeginMessage(Address.GetPlainANSIString());
for(int32 i=Data.Index, n=Data.Queue.Num(); i<n; ++i) for(int32 i=Data.Index, n=Data.Queue.Num(); i<n; ++i)
{ {
const auto & elem = Data.Queue[i]; const auto & elem = Data.Queue[i];
OSC/Source/OSC/Private/Common/OscFunctionLibrary.h
+1 -1
View File
@@ -50,5 +50,5 @@ class UOscFunctionLibrary : public UBlueprintFunctionLibrary
* @param Index index of the destination, -1 for all destinations. (SendTarget list of the plugin settings) * @param Index index of the destination, -1 for all destinations. (SendTarget list of the plugin settings)
*/ */
UFUNCTION(BlueprintCallable, Category=OSC) UFUNCTION(BlueprintCallable, Category=OSC)
static void SendOsc(const FString & Address, const FOscDataStruct & Data, int32 TargetIndex); static void SendOsc(FName Address, const FOscDataStruct & Data, int32 TargetIndex);
}; };