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

Merge branch 'master' of https://github.com/monsieurgustav/UE4-OSC

Browse Source
This commit is contained in:
L05
2019-12-20 08:30:35 -08:00
parent 6d3ccfea36 4e0820dc54
commit 0fe49f8696
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OSC/Source/OSC/Private/OscSettings.cpp
+5 -5
View File
@@ -9,14 +9,14 @@
UOscSettings::UOscSettings()
: ReceiveFrom("8000"),
MulticastLoopback(true),
_sendSocket(FUdpSocketBuilder(TEXT("OscSender")).Build())
MulticastLoopback(true)
{
FIPv4Endpoint::Initialize();
_sendSocket = MakeShareable(FUdpSocketBuilder(TEXT("OscSender")).Build());
SendTargets.Add(TEXT("127.0.0.1:8000"));
}
UOscSettings::UOscSettings(FVTableHelper & helper)
: _sendSocket(FUdpSocketBuilder(TEXT("OscSender")).Build())
{
// Does not need to be a valid object.
}
@@ -98,7 +98,7 @@ void UOscSettings::Send(const uint8 *buffer, int32 length, int32 targetIndex)
bool error = false;
for(const auto & address : _sendAddresses)
{
if(!SendImpl(&_sendSocket.Get(), buffer, length, *address))
if(!SendImpl(_sendSocket.Get(), buffer, length, *address))
{
const auto target = address->ToString(true);
UE_LOG(LogOSC, Error, TEXT("Cannot send OSC: %s : socket cannot send data"), *target);
@@ -120,7 +120,7 @@ void UOscSettings::Send(const uint8 *buffer, int32 length, int32 targetIndex)
else if(targetIndex < _sendAddresses.Num())
{
bool error = false;
if(!SendImpl(&_sendSocket.Get(), buffer, length, *_sendAddresses[targetIndex]))
if(!SendImpl(_sendSocket.Get(), buffer, length, *_sendAddresses[targetIndex]))
{
const auto target = _sendAddresses[targetIndex]->ToString(true);
UE_LOG(LogOSC, Error, TEXT("Cannot send OSC: %s : socket cannot send data"), *target);
OSC/Source/OSC/Private/OscSettings.h
+1 -1
View File
@@ -91,7 +91,7 @@ private:
int32 AddSendTarget(const FString & ip_port);
private:
TSharedRef<FSocket> _sendSocket;
TSharedPtr<FSocket> _sendSocket;
TArray<TSharedRef<FInternetAddr>> _sendAddresses;
TMap<FString, int32> _sendAddressesIndex;
TArray<std::unique_ptr<OscReceiverInputKey>> _keyReceivers;