diff --git a/Qualisys/QTMConnectLiveLink/QTMConnectLiveLink.uplugin b/Qualisys/QTMConnectLiveLink/QTMConnectLiveLink.uplugin index 9a74af7..de93391 100644 --- a/Qualisys/QTMConnectLiveLink/QTMConnectLiveLink.uplugin +++ b/Qualisys/QTMConnectLiveLink/QTMConnectLiveLink.uplugin @@ -21,7 +21,7 @@ "Win64" ], "BlacklistPlatforms":[ - "Android","Linux","PS4","HTML5","Mac","IOS","XBoxOne" + "Android","Linux","Mac","IOS" ] }, { @@ -32,7 +32,7 @@ "Win64" ], "BlacklistPlatforms":[ - "Android","Linux","PS4","HTML5","Mac","IOS","XBoxOne" + "Android","Linux","Mac","IOS" ] } ], diff --git a/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Private/QTMConnectLiveLinkLog.cpp b/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Private/QTMConnectLiveLinkLog.cpp new file mode 100644 index 0000000..8632fd7 --- /dev/null +++ b/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Private/QTMConnectLiveLinkLog.cpp @@ -0,0 +1,5 @@ +#include "QTMConnectLiveLinkLog.h" + +DEFINE_LOG_CATEGORY(QTMConnectLiveLinkLog) + + diff --git a/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Private/QTMConnectLiveLinkSource.cpp b/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Private/QTMConnectLiveLinkSource.cpp index 8f69298..7a8f848 100644 --- a/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Private/QTMConnectLiveLinkSource.cpp +++ b/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Private/QTMConnectLiveLinkSource.cpp @@ -1,6 +1,7 @@ // QTM Connect For Unreal. Copyright 2018-2022 Qualisys // #include "QTMConnectLiveLinkSource.h" +#include "QTMConnectLiveLinkLog.h" #include "ILiveLinkClient.h" #include "LiveLinkTypes.h" #include "Roles/LiveLinkAnimationRole.h" @@ -8,11 +9,15 @@ #include "Roles/LiveLinkTransformTypes.h" #include "Roles/LiveLinkBasicRole.h" +#if PLATFORM_WINDOWS #include "Windows/AllowWindowsPlatformTypes.h" #include "Windows/AllowWindowsPlatformAtomics.h" +#endif #include "RTProtocol.h" +#if PLATFORM_WINDOWS #include "Windows/HideWindowsPlatformAtomics.h" #include "Windows/HideWindowsPlatformTypes.h" +#endif #include "CommonFrameRates.h" #include @@ -265,7 +270,7 @@ uint32 FQTMConnectLiveLinkSource::Run() if (mRTProtocol->GetDiscoverResponse(0, addr, basePort, message)) { char serverAddr[40]; - sprintf_s(serverAddr, "%d.%d.%d.%d", 0xff & addr, 0xff & (addr >> 8), 0xff & (addr >> 16), 0xff & (addr >> 24)); + UE_LOG(QTMConnectLiveLinkLog,Log,TEXT("%d.%d.%d.%d"),0xff & addr, 0xff & (addr >> 8), 0xff & (addr >> 16), 0xff & (addr >> 24)); serverAddress = serverAddr; } } @@ -446,7 +451,7 @@ uint32 FQTMConnectLiveLinkSource::Run() } case CRTPacket::TimecodeCamerTime: { - unsigned __int64 cameraTime; + uint64 cameraTime; //on windows platforms uint64 resolves to unsigned long long which is synonymous with unsigned __int64 packet->GetTimecodeCameraTime(cameraTime); const auto seconds = (cameraTime / 10000000); ConstructLiveLinkTimeCode(timecodeFrequency, seconds, sceneTime); diff --git a/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Public/QTMConnectLiveLinkLog.h b/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Public/QTMConnectLiveLinkLog.h new file mode 100644 index 0000000..47ebd14 --- /dev/null +++ b/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Public/QTMConnectLiveLinkLog.h @@ -0,0 +1,4 @@ +#pragma once + + +DECLARE_LOG_CATEGORY_EXTERN(QTMConnectLiveLinkLog,Log,All) \ No newline at end of file diff --git a/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Public/QTMConnectLiveLinkSource.h b/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Public/QTMConnectLiveLinkSource.h index afcd05a..d43f6aa 100644 --- a/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Public/QTMConnectLiveLinkSource.h +++ b/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Public/QTMConnectLiveLinkSource.h @@ -6,14 +6,18 @@ #include "MessageEndpoint.h" #include "IMessageContext.h" #include "HAL/ThreadSafeBool.h" +#include "HAL/Runnable.h" +#include "HAL/RunnableThread.h" -#include "Networking.h" #include "Sockets.h" #include "SocketSubsystem.h" #include #include #include + + + class ILiveLinkClient; class CRTProtocol;