Skip to content

Commit 7460092

Browse files
tljdebrouwertljdebrouwer
authored
Merge pull request #16 from OCAAlliance/property-change-subscription
Property change subscription
2 parents 5a1e03c + 67edb6d commit 7460092

File tree

199 files changed

+2083
-5292
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+2083
-5292
lines changed

Diff for: ‎OCACompliancyTestTool/Aes70CompliancyTestTool/Aes70CompliancyTestTool.vcxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<Link>
105105
<SubSystem>Console</SubSystem>
106106
<GenerateDebugInformation>true</GenerateDebugInformation>
107-
<AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/OcaLite/BonjourSDK/x86/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
107+
<AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/BonjourSDK/x86/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
108108
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
109109
<IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
110110
</Link>
@@ -127,7 +127,7 @@ xcopy xml\*.xsd $(OutDir)xml /Y</Command>
127127
<Link>
128128
<SubSystem>Console</SubSystem>
129129
<GenerateDebugInformation>true</GenerateDebugInformation>
130-
<AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/OcaLite/BonjourSDK/x64/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
130+
<AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/BonjourSDK/x64/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
131131
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
132132
<IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
133133
</Link>
@@ -154,7 +154,7 @@ xcopy xml\*.xsd $(OutDir)xml /Y</Command>
154154
<EnableCOMDATFolding>true</EnableCOMDATFolding>
155155
<OptimizeReferences>true</OptimizeReferences>
156156
<GenerateDebugInformation>true</GenerateDebugInformation>
157-
<AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/OcaLite/BonjourSDK/x86/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
157+
<AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/BonjourSDK/x86/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
158158
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
159159
<IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
160160
</Link>
@@ -181,7 +181,7 @@ xcopy xml\*.xsd $(OutDir)xml /Y</Command>
181181
<EnableCOMDATFolding>true</EnableCOMDATFolding>
182182
<OptimizeReferences>true</OptimizeReferences>
183183
<GenerateDebugInformation>true</GenerateDebugInformation>
184-
<AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/OcaLite/BonjourSDK/x64/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
184+
<AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/BonjourSDK/x64/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
185185
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
186186
<IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
187187
</Link>

Diff for: ‎OCACompliancyTestTool/Aes70CompliancyTestTool/HostInterface/OCA/OCP.1/ZeroConf/OcaLiteOcp1Service.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// ---- Include system wide include files ----
99
#include <HostInterfaceLite/OCA/OCP.1/ZeroConf/IOcp1LiteService.h>
1010
#include <HostInterfaceLite/OCA/OCF/OcfLiteHostInterface.h>
11-
#include <../../platform/common/OcaLite/BonjourSDK/dns_sd.h>
11+
#include <../../platform/common/BonjourSDK/dns_sd.h>
1212

1313
// ---- FileInfo Macro ----
1414

Diff for: ‎OCACompliancyTestTool/Aes70CompliancyTestTool/TestFramework/BaseTestClass.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ using namespace std;
1111
#include <stdarg.h>
1212
#include <algorithm>
1313
#include <HostInterfaceLite/OCA/OCF/OcfLiteHostInterface.h>
14-
#include <OCALite/OCP.1/Ocp1LiteConnectParameters.h>
14+
#include <OCP.1/Ocp1LiteConnectParameters.h>
1515

1616
// ---- FileInfo Macro ----
1717

Diff for: ‎OCACompliancyTestTool/Aes70CompliancyTestTool/TestFramework/TestContext.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#define TEST_CONTEXT_H
99

1010
// ---- Include system wide include files ----
11-
#include <OCALite/OCC/ControlDataTypes/OcaLiteBaseDataTypes.h>
12-
#include <OCALite/OCC/ControlDataTypes/OcaLiteFrameworkDataTypes.h>
11+
#include <OCC/ControlDataTypes/OcaLiteBaseDataTypes.h>
12+
#include <OCC/ControlDataTypes/OcaLiteFrameworkDataTypes.h>
1313
#include <DNSSDResolver.h>
1414

1515
// ---- Include local include files ----

Diff for: ‎OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/MinimumObjectCompliancyTest/MinimumObjectCompliancyTest.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
*/
66

77
// ---- Include system wide include files ----
8-
#include <OCALite/Proxy/GeneralProxy.h>
9-
#include <OCALite/OCC/ControlClasses/Workers/BlocksAndMatrices/OcaLiteBlock.h>
10-
#include <OCALite/OCC/ControlClasses/Managers/OcaLiteNetworkManager.h>
11-
#include <OCALite/OCC/ControlClasses/Managers/OcaLiteMediaClockManager.h>
12-
#include <OCALite/OCC/ControlClasses/Agents/OcaLiteTimeSource.h>
13-
#include <OCALite/OCC/ControlDataTypes/OcaLiteMethod.h>
14-
#include <OCALite/OCC/ControlDataTypes/OcaLiteManagerDescriptor.h>
15-
#include <OCALite/OCC/ControlDataTypes/OcaLiteEvent.h>
16-
#include <OCALite/OCC/ControlDataTypes/OcaLiteBlockMember.h>
17-
#include <OCALite/OCP.1/Ocp1LiteNetworkAddress.h>
8+
#include <Proxy/GeneralProxy.h>
9+
#include <OCC/ControlClasses/Workers/BlocksAndMatrices/OcaLiteBlock.h>
10+
#include <OCC/ControlClasses/Managers/OcaLiteNetworkManager.h>
11+
#include <OCC/ControlClasses/Managers/OcaLiteMediaClockManager.h>
12+
#include <OCC/ControlClasses/Agents/OcaLiteTimeSource.h>
13+
#include <OCC/ControlDataTypes/OcaLiteMethod.h>
14+
#include <OCC/ControlDataTypes/OcaLiteManagerDescriptor.h>
15+
#include <OCC/ControlDataTypes/OcaLiteEvent.h>
16+
#include <OCC/ControlDataTypes/OcaLiteBlockMember.h>
17+
#include <OCP.1/Ocp1LiteNetworkAddress.h>
1818

1919
// ---- FileInfo Macro ----
2020

Diff for: ‎OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCC/ObjectCompliancyTest.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
*/
66

77
// ---- Include system wide include files ----
8-
#include <OCALite/Proxy/GeneralProxy.h>
9-
#include <OCALite/OCC/ControlClasses/Workers/BlocksAndMatrices/OcaLiteBlock.h>
10-
#include <OCALite/OCC/ControlDataTypes/OcaLiteMethod.h>
11-
#include <OCALite/OCC/ControlDataTypes/OcaLiteManagerDescriptor.h>
12-
#include <OCALite/OCC/ControlDataTypes/OcaLiteEvent.h>
13-
#include <OCALite/OCC/ControlDataTypes/OcaLiteBlockMember.h>
14-
#include <OCALite/OCP.1/Ocp1LiteNetworkAddress.h>
8+
#include <Proxy/GeneralProxy.h>
9+
#include <OCC/ControlClasses/Workers/BlocksAndMatrices/OcaLiteBlock.h>
10+
#include <OCC/ControlDataTypes/OcaLiteMethod.h>
11+
#include <OCC/ControlDataTypes/OcaLiteManagerDescriptor.h>
12+
#include <OCC/ControlDataTypes/OcaLiteEvent.h>
13+
#include <OCC/ControlDataTypes/OcaLiteBlockMember.h>
14+
#include <OCP.1/Ocp1LiteNetworkAddress.h>
1515

1616
// ---- FileInfo Macro ----
1717

Diff for: ‎OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCP.1/DeviceResetTest.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#include <fstream>
1010
#include <vector>
1111
#include <HostInterfaceLite/OCA/OCF/Timer/IOcfLiteTimer.h>
12-
#include <OCALite/Proxy/GeneralProxy.h>
13-
#include <OCALite/OCC/ControlClasses/Managers/OcaLiteNetworkManager.h>
14-
#include <OCALite/OCP.1/Ocp1LiteNetworkAddress.h>
15-
#include <OCALite/OCP.1/Ocp1LiteNetwork.h>
12+
#include <Proxy/GeneralProxy.h>
13+
#include <OCC/ControlClasses/Managers/OcaLiteNetworkManager.h>
14+
#include <OCP.1/Ocp1LiteNetworkAddress.h>
15+
#include <OCP.1/Ocp1LiteNetwork.h>
1616
#include <rapidxml/rapidxml.hpp>
1717
using namespace rapidxml;
1818
using namespace std;

Diff for: ‎OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCP.1/DeviceServiceDiscoveryTest.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
// ---- Include system wide include files ----
88
#include <DNSSDResolver.h>
9-
#include <OCALite/OCC/ControlClasses/Workers/BlocksAndMatrices/OcaLiteBlock.h>
10-
#include <OCALite/OCC/ControlDataTypes/OcaLiteBlockMember.h>
11-
#include <OCALite/OCC/ControlDataTypes/OcaLiteManagerDescriptor.h>
12-
#include <OCALite/OCP.1/Ocp1LiteConnectParameters.h>
13-
#include <OCALite/Proxy/GeneralProxy.h>
9+
#include <OCC/ControlClasses/Workers/BlocksAndMatrices/OcaLiteBlock.h>
10+
#include <OCC/ControlDataTypes/OcaLiteBlockMember.h>
11+
#include <OCC/ControlDataTypes/OcaLiteManagerDescriptor.h>
12+
#include <OCP.1/Ocp1LiteConnectParameters.h>
13+
#include <Proxy/GeneralProxy.h>
1414

1515
// ---- FileInfo Macro ----
1616

Diff for: ‎OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCP.1/KeepAliveTest.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
// ---- Include system wide include files ----
8-
#include <OCALite/OCP.1/Ocp1LiteConnectParameters.h>
8+
#include <OCP.1/Ocp1LiteConnectParameters.h>
99
#include <HostInterfaceLite/OCA/OCF/Timer/IOcfLiteTimer.h>
1010

1111
// ---- FileInfo Macro ----

Diff for: ‎OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCP.1/KeepAliveTest.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
// ---- Include local include files ----
1313
#include "../../TestFramework/BaseTestClass.h"
14-
#include <OCALite/OCF/OcaLiteCommandHandlerController.h>
14+
#include <OCF/OcaLiteCommandHandlerController.h>
1515

1616
// ---- Referenced classes and types ----
1717

Diff for: ‎OCACompliancyTestTool/DNSSDResolver/DNSSDResolver.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// ---- Include system wide include files ----
1111
#include <PlatformDataTypes.h>
1212
#define _WINSOCKAPI_
13-
#include <../platform/common/OcaLite/BonjourSDK/dns_sd.h>
13+
#include <../platform/common/BonjourSDK/dns_sd.h>
1414

1515
// ---- Include local include files ----
1616
#include "ResolveResult.h"

Diff for: ‎OCAMicro/OCAMicro/Src/app/OCALite/HostInterface/OCA/OCF/Configuration/OcaLiteOcfConfiguration.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
#include <HostInterfaceLite/OCA/OCF/Configuration/IOcfLiteConfigure.h>
1414
#ifdef _WIN32
1515
#include <Winsock2.h>
16-
#else
16+
#elif __APPLE__
17+
#include <unistd.h>
1718
#endif
1819

1920
// ---- FileInfo Macro ----

Diff for: ‎OCAMicro/OCAMicro/Src/app/OCALite/HostInterface/OCA/OCF/Logging/OcaLiteOcfLogger.cpp

+18-3
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,15 @@ void OcfLiteLogLogMessage(UINT8 logLevel, const char* type, const char* file, UI
4646
UINT32 messageLength(static_cast<UINT32>(::vsnprintf(NULL, 0, message, argList) + 1));
4747
if (messageLength <= MAX_FULL_MESSAGE_LENGTH)
4848
{
49+
// For Apple this seems required to reset the argList after above vsnprintf function
50+
va_start(argList, message);
51+
52+
#ifdef _WIN32
4953
INT32 result(::vsprintf_s(m_fullLogMessage, message, argList));
50-
bool bAddCarrageReturn = false;
54+
#else
55+
INT32 result(::vsprintf(m_fullLogMessage, message, argList));
56+
#endif
57+
bool bAddCarrageReturn = false;
5158

5259
if (static_cast<UINT32>(result) <= messageLength)
5360
{
@@ -72,11 +79,11 @@ void OcfLiteLogLogMessage(UINT8 logLevel, const char* type, const char* file, UI
7279

7380
if (m_fullLogMessage[0] == '.')
7481
{
75-
printf("%s%s", &m_fullLogMessage[1], bAddCarrageReturn? "\r\n": "");
82+
printf("%s%s", &m_fullLogMessage[1], bAddCarrageReturn ? "\r\n" : "");
7683
}
7784
else
7885
{
79-
printf("%*s%s%s", m_indent, "", m_fullLogMessage, bAddCarrageReturn? "\r\n": "");
86+
printf("%*s%s%s", m_indent, "", m_fullLogMessage, bAddCarrageReturn ? "\r\n" : "");
8087
}
8188

8289
// Increase message indent
@@ -85,6 +92,14 @@ void OcfLiteLogLogMessage(UINT8 logLevel, const char* type, const char* file, UI
8592
m_indent += 2;
8693
}
8794
}
95+
else
96+
{
97+
printf("Buffer overflow in processing log message\r\n");
98+
}
99+
}
100+
else
101+
{
102+
printf("Buffer overflow in log message\r\n");
88103
}
89104
va_end(argList);
90105
}

Diff for: ‎OCAMicro/OCAMicro/Src/app/OCALite/HostInterface/OCA/OCF/Timer/OcaLiteOcfTimer.cpp

+12
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@
99
*/
1010

1111
// ---- Include system wide include files ----
12+
#ifdef _WIN32
1213
#include <Windows.h>
14+
#else
15+
#include <sys/time.h>
16+
#include <stdio.h>
17+
#include <unistd.h>
18+
#endif
1319

1420
// ---- FileInfo Macro ----
1521

@@ -21,5 +27,11 @@
2127
// Platform-specific implementation of static method 'GetTimerTickCount' of base class
2228
UINT32 OcfLiteTimerGetTimerTickCount(void)
2329
{
30+
#ifdef _WIN32
2431
return ::GetTickCount();
32+
#else
33+
struct timeval start;
34+
gettimeofday(&start, NULL);
35+
return (UINT32)((start.tv_sec) * 1000 + start.tv_usec/1000.0);
36+
#endif
2537
}

Diff for: ‎OCAMicro/OCAMicro/Src/app/OCALite/HostInterface/OCA/OCP.1/Network/OcaLiteOcp1Network.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ bool Ocp1LiteNetworkInitialize()
2828
{
2929
if (!m_bInitialized)
3030
{
31+
#ifdef _WIN32
3132
int iResult;
3233
WSADATA wsaData;
3334
// Initialize Winsock
@@ -40,6 +41,9 @@ bool Ocp1LiteNetworkInitialize()
4041
{
4142
m_bInitialized = true;
4243
}
44+
#else
45+
m_bInitialized = true;
46+
#endif
4347
}
4448

4549
return true;

0 commit comments

Comments
 (0)