FlightSim-Streaming/XPlaneConnectCSP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved XPData array to DataManager and removed DataMaps.

Browse Source 
After removing C++11 features, only the declaration of XPData remained in DataMaps, making it somewhat pointless to separate XPData from DataManager.
This commit is contained in:
Jason Watkins
2015-05-05 11:44:36 -07:00
parent aeceb87f1d
commit 7f1af73c3c
7 changed files with 5 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xpcPlugin/DataManager.cpp
View File

@@ -15,7 +15,6 @@
// without specific prior written permission from the authors or // without specific prior written permission from the authors or
// Laminar Research, respectively. // Laminar Research, respectively.
#include "DataManager.h" #include "DataManager.h"
#include "DataMaps.h"
#include "Log.h" #include "Log.h"
#include "XPLMDataAccess.h" #include "XPLMDataAccess.h"
@@ -33,6 +32,8 @@ namespace XPC
static map<DREF, XPLMDataRef> mdrefs[20]; static map<DREF, XPLMDataRef> mdrefs[20];
static map<string, XPLMDataRef> sdrefs; static map<string, XPLMDataRef> sdrefs;
DREF XPData[134][8] = { DREF_None };
void DataManager::Initialize() void DataManager::Initialize()
{ {
drefs.insert(make_pair(DREF_None, XPLMFindDataRef("sim/test/test_float"))); drefs.insert(make_pair(DREF_None, XPLMFindDataRef("sim/test/test_float")));

3
xpcPlugin/DataManager.h
View File

@@ -135,6 +135,9 @@ namespace XPC
DREF_MP7Alt, DREF_MP7Alt,
}; };
/// Maps X-Plane dataref lines to XPC DREF values.
extern DREF XPData[134][8];
/// Marshals data between the plugin and X-Plane. /// Marshals data between the plugin and X-Plane.
/// ///
/// \author Jason Watkins /// \author Jason Watkins

8
xpcPlugin/DataMaps.cpp
View File

@@ -1,8 +0,0 @@
//Copyright (c) 2013-2015 United States Government as represented by the Administrator of the
//National Aeronautics and Space Administration. All Rights Reserved.
#include "DataManager.h"
namespace XPC
{
DREF XPData[134][8] = { DREF_None };
}

13
xpcPlugin/DataMaps.h
View File

@@ -1,13 +0,0 @@
//Copyright (c) 2013-2015 United States Government as represented by the Administrator of the
//National Aeronautics and Space Administration. All Rights Reserved.
#ifndef XPC_DATAMAPS_H
#define XPC_DATAMAPS_H
#include "DataManager.h"
namespace XPC
{
/// Maps X-Plane dataref lines to XPC DREF values.
extern DREF XPData[134][8];
}
#endif

1
xpcPlugin/MessageHandlers.cpp
View File

@@ -2,7 +2,6 @@
//National Aeronautics and Space Administration. All Rights Reserved. //National Aeronautics and Space Administration. All Rights Reserved.
#include "MessageHandlers.h" #include "MessageHandlers.h"
#include "DataManager.h" #include "DataManager.h"
#include "DataMaps.h"
#include "Drawing.h" #include "Drawing.h"
#include "Log.h" #include "Log.h"

2
xpcPlugin/xpcPlugin/xpcPlugin.vcxproj
View File

@@ -201,7 +201,6 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\DataManager.h" /> <ClInclude Include="..\DataManager.h" />
<ClInclude Include="..\DataMaps.h" />
<ClInclude Include="..\Drawing.h" /> <ClInclude Include="..\Drawing.h" />
<ClInclude Include="..\Log.h" /> <ClInclude Include="..\Log.h" />
<ClInclude Include="..\Message.h" /> <ClInclude Include="..\Message.h" />
@@ -210,7 +209,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\DataManager.cpp" /> <ClCompile Include="..\DataManager.cpp" />
<ClCompile Include="..\DataMaps.cpp" />
<ClCompile Include="..\Drawing.cpp" /> <ClCompile Include="..\Drawing.cpp" />
<ClCompile Include="..\Log.cpp" /> <ClCompile Include="..\Log.cpp" />
<ClCompile Include="..\Message.cpp" /> <ClCompile Include="..\Message.cpp" />

6
xpcPlugin/xpcPlugin/xpcPlugin.vcxproj.filters
View File

@@ -30,9 +30,6 @@
<ClInclude Include="..\DataManager.h"> <ClInclude Include="..\DataManager.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\DataMaps.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\MessageHandlers.h"> <ClInclude Include="..\MessageHandlers.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@@ -59,9 +56,6 @@
<ClCompile Include="..\MessageHandlers.cpp"> <ClCompile Include="..\MessageHandlers.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\DataMaps.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Library Include="..\SDK\Libraries\Win\XPLM.lib"> <Library Include="..\SDK\Libraries\Win\XPLM.lib">