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

Updated XPlane SDK to version 2.1.3

Browse Source
This commit is contained in:
Jason Watkins
2017-08-26 14:45:56 -07:00
parent 012df27187
commit 71d4d5aa27
11 changed files with 72 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xpcPlugin/SDK/CHeaders/Wrappers/XPCBroadcaster.cpp
View File

@@ -42,7 +42,7 @@ void XPCBroadcaster::RemoveListener(
} }
void XPCBroadcaster::BroadcastMessage( void XPCBroadcaster::BroadcastMessage(
long inMessage, int inMessage,
void * inParam) void * inParam)
{ {
ListenerVector::iterator iter; ListenerVector::iterator iter;

2
xpcPlugin/SDK/CHeaders/Wrappers/XPCBroadcaster.h
View File

@@ -20,7 +20,7 @@ public:
protected: protected:
void BroadcastMessage( void BroadcastMessage(
long inMessage, int inMessage,
void * inParam=0); void * inParam=0);
private: private:

2
xpcPlugin/SDK/CHeaders/Wrappers/XPCListener.h
View File

@@ -14,7 +14,7 @@ public:
virtual ~XPCListener(); virtual ~XPCListener();
virtual void ListenToMessage( virtual void ListenToMessage(
long inMessage, int inMessage,
void * inParam)=0; void * inParam)=0;
private: private:

2
xpcPlugin/SDK/CHeaders/Wrappers/XPCProcessing.cpp
View File

@@ -21,7 +21,7 @@ void XPCProcess::StartProcessTime(float inSeconds)
FlightLoopCB, mCallbackTime, 1/*relative to now*/, reinterpret_cast<void *>(this)); FlightLoopCB, mCallbackTime, 1/*relative to now*/, reinterpret_cast<void *>(this));
} }
void XPCProcess::StartProcessCycles(long inCycles) void XPCProcess::StartProcessCycles(int inCycles)
{ {
mCallbackTime = -inCycles; mCallbackTime = -inCycles;
if (!mInCallback) if (!mInCallback)

2
xpcPlugin/SDK/CHeaders/Wrappers/XPCProcessing.h
View File

@@ -10,7 +10,7 @@ public:
virtual ~XPCProcess(); virtual ~XPCProcess();
void StartProcessTime(float inSeconds); void StartProcessTime(float inSeconds);
void StartProcessCycles(long inCycles); void StartProcessCycles(int inCycles);
void StopProcess(void); void StopProcess(void);
virtual void DoProcessing( virtual void DoProcessing(

12
xpcPlugin/SDK/CHeaders/Wrappers/XPCWidget.cpp
View File

@@ -22,7 +22,7 @@ XPCWidget::XPCWidget(
inIsRoot ? NULL : inParent, inIsRoot ? NULL : inParent,
inClass); inClass);
XPSetWidgetProperty(mWidget, xpProperty_Object, reinterpret_cast<long>(this)); XPSetWidgetProperty(mWidget, xpProperty_Object, reinterpret_cast<intptr_t>(this));
XPAddWidgetCallback(mWidget, WidgetCallback); XPAddWidgetCallback(mWidget, WidgetCallback);
} }
@@ -33,7 +33,7 @@ XPCWidget::XPCWidget(
mOwnsChildren(false), mOwnsChildren(false),
mOwnsWidget(inOwnsWidget) mOwnsWidget(inOwnsWidget)
{ {
XPSetWidgetProperty(mWidget, xpProperty_Object, reinterpret_cast<long>(this)); XPSetWidgetProperty(mWidget, xpProperty_Object, reinterpret_cast<intptr_t>(this));
XPAddWidgetCallback(mWidget, WidgetCallback); XPAddWidgetCallback(mWidget, WidgetCallback);
} }
@@ -95,8 +95,8 @@ void XPCWidget::RemoveAttachment(
int XPCWidget::HandleWidgetMessage( int XPCWidget::HandleWidgetMessage(
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2) intptr_t inParam2)
{ {
return 0; return 0;
} }
@@ -104,8 +104,8 @@ int XPCWidget::HandleWidgetMessage(
int XPCWidget::WidgetCallback( int XPCWidget::WidgetCallback(
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2) intptr_t inParam2)
{ {
XPCWidget * me = reinterpret_cast<XPCWidget *>(XPGetWidgetProperty(inWidget, xpProperty_Object, NULL)); XPCWidget * me = reinterpret_cast<XPCWidget *>(XPGetWidgetProperty(inWidget, xpProperty_Object, NULL));
if (me == NULL) if (me == NULL)

12
xpcPlugin/SDK/CHeaders/Wrappers/XPCWidget.h
View File

@@ -14,8 +14,8 @@ public:
XPCWidget * inObject, XPCWidget * inObject,
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2)=0; intptr_t inParam2)=0;
}; };
@@ -56,16 +56,16 @@ public:
virtual int HandleWidgetMessage( virtual int HandleWidgetMessage(
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2); intptr_t inParam2);
private: private:
static int WidgetCallback( static int WidgetCallback(
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2); intptr_t inParam2);
typedef std::pair<XPCWidgetAttachment *, bool> AttachmentInfo; typedef std::pair<XPCWidgetAttachment *, bool> AttachmentInfo;
typedef std::vector<AttachmentInfo> AttachmentVector; typedef std::vector<AttachmentInfo> AttachmentVector;

38
xpcPlugin/SDK/CHeaders/Wrappers/XPCWidgetAttachments.cpp
View File

@@ -22,8 +22,8 @@ int XPCKeyFilterAttachment::HandleWidgetMessage(
XPCWidget * inObject, XPCWidget * inObject,
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2) intptr_t inParam2)
{ {
if (inMessage == xpMsg_KeyPress) if (inMessage == xpMsg_KeyPress)
{ {
@@ -42,7 +42,7 @@ int XPCKeyFilterAttachment::HandleWidgetMessage(
XPCKeyMessageAttachment::XPCKeyMessageAttachment( XPCKeyMessageAttachment::XPCKeyMessageAttachment(
char inKey, char inKey,
long inMessage, int inMessage,
void * inParam, void * inParam,
bool inConsume, bool inConsume,
bool inVkey, bool inVkey,
@@ -62,8 +62,8 @@ int XPCKeyMessageAttachment::HandleWidgetMessage(
XPCWidget * inObject, XPCWidget * inObject,
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2) intptr_t inParam2)
{ {
if (inMessage == xpMsg_KeyPress) if (inMessage == xpMsg_KeyPress)
{ {
@@ -81,7 +81,7 @@ int XPCKeyMessageAttachment::HandleWidgetMessage(
XPCPushButtonMessageAttachment::XPCPushButtonMessageAttachment( XPCPushButtonMessageAttachment::XPCPushButtonMessageAttachment(
XPWidgetID inWidget, XPWidgetID inWidget,
long inMessage, int inMessage,
void * inParam, void * inParam,
XPCListener * inListener) : XPCListener * inListener) :
mMsg(inMessage), mParam(inParam), mWidget(inWidget) mMsg(inMessage), mParam(inParam), mWidget(inWidget)
@@ -98,8 +98,8 @@ int XPCPushButtonMessageAttachment::HandleWidgetMessage(
XPCWidget * inObject, XPCWidget * inObject,
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2) intptr_t inParam2)
{ {
if ((inMessage == xpMsg_PushButtonPressed) && ((XPWidgetID) inParam1 == mWidget)) if ((inMessage == xpMsg_PushButtonPressed) && ((XPWidgetID) inParam1 == mWidget))
{ {
@@ -117,7 +117,7 @@ int XPCPushButtonMessageAttachment::HandleWidgetMessage(
XPCSliderMessageAttachment::XPCSliderMessageAttachment( XPCSliderMessageAttachment::XPCSliderMessageAttachment(
XPWidgetID inWidget, XPWidgetID inWidget,
long inMessage, int inMessage,
void * inParam, void * inParam,
XPCListener * inListener) : XPCListener * inListener) :
mMsg(inMessage), mParam(inParam), mWidget(inWidget) mMsg(inMessage), mParam(inParam), mWidget(inWidget)
@@ -134,8 +134,8 @@ int XPCSliderMessageAttachment::HandleWidgetMessage(
XPCWidget * inObject, XPCWidget * inObject,
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2) intptr_t inParam2)
{ {
if ((inMessage == xpMsg_ScrollBarSliderPositionChanged) && ((XPWidgetID) inParam1 == mWidget)) if ((inMessage == xpMsg_ScrollBarSliderPositionChanged) && ((XPWidgetID) inParam1 == mWidget))
{ {
@@ -149,7 +149,7 @@ int XPCSliderMessageAttachment::HandleWidgetMessage(
XPCCloseButtonMessageAttachment::XPCCloseButtonMessageAttachment( XPCCloseButtonMessageAttachment::XPCCloseButtonMessageAttachment(
XPWidgetID inWidget, XPWidgetID inWidget,
long inMessage, int inMessage,
void * inParam, void * inParam,
XPCListener * inListener) : XPCListener * inListener) :
mMsg(inMessage), mParam(inParam), mWidget(inWidget) mMsg(inMessage), mParam(inParam), mWidget(inWidget)
@@ -166,8 +166,8 @@ int XPCCloseButtonMessageAttachment::HandleWidgetMessage(
XPCWidget * inObject, XPCWidget * inObject,
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2) intptr_t inParam2)
{ {
if ((inMessage == xpMessage_CloseButtonPushed) && ((XPWidgetID) inParam1 == mWidget)) if ((inMessage == xpMessage_CloseButtonPushed) && ((XPWidgetID) inParam1 == mWidget))
{ {
@@ -190,8 +190,8 @@ int XPCTabGroupAttachment::HandleWidgetMessage(
XPCWidget * inObject, XPCWidget * inObject,
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2) intptr_t inParam2)
{ {
if ((inMessage == xpMsg_KeyPress) && (KEY_CHAR(inParam1) == XPLM_KEY_TAB) && if ((inMessage == xpMsg_KeyPress) && (KEY_CHAR(inParam1) == XPLM_KEY_TAB) &&
((KEY_FLAGS(inParam1) & xplm_UpFlag) == 0)) ((KEY_FLAGS(inParam1) & xplm_UpFlag) == 0))
@@ -199,7 +199,7 @@ int XPCTabGroupAttachment::HandleWidgetMessage(
bool backwards = (KEY_FLAGS(inParam1) & xplm_ShiftFlag) != 0; bool backwards = (KEY_FLAGS(inParam1) & xplm_ShiftFlag) != 0;
std::vector<XPWidgetID> widgets; std::vector<XPWidgetID> widgets;
XPCGetOrderedSubWidgets(inWidget, widgets); XPCGetOrderedSubWidgets(inWidget, widgets);
long n, index = 0; int n, index = 0;
XPWidgetID focusWidget = XPGetWidgetWithFocus(); XPWidgetID focusWidget = XPGetWidgetWithFocus();
std::vector<XPWidgetID>::iterator iter = std::find(widgets.begin(), widgets.end(), focusWidget); std::vector<XPWidgetID>::iterator iter = std::find(widgets.begin(), widgets.end(), focusWidget);
if (iter != widgets.end()) if (iter != widgets.end())
@@ -254,8 +254,8 @@ static void XPCGetOrderedSubWidgets(
std::vector<XPWidgetID>& outChildren) std::vector<XPWidgetID>& outChildren)
{ {
outChildren.clear(); outChildren.clear();
long count = XPCountChildWidgets(inWidget); int count = XPCountChildWidgets(inWidget);
for (long n = 0; n < count; ++n) for (int n = 0; n < count; ++n)
{ {
XPWidgetID child = XPGetNthChildWidget(inWidget, n); XPWidgetID child = XPGetNthChildWidget(inWidget, n);
outChildren.push_back(child); outChildren.push_back(child);

40
xpcPlugin/SDK/CHeaders/Wrappers/XPCWidgetAttachments.h
View File

@@ -18,8 +18,8 @@ public:
XPCWidget * inObject, XPCWidget * inObject,
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2); intptr_t inParam2);
private: private:
@@ -34,7 +34,7 @@ public:
XPCKeyMessageAttachment( XPCKeyMessageAttachment(
char inKey, char inKey,
long inMessage, int inMessage,
void * inParam, void * inParam,
bool inConsume, bool inConsume,
bool inVkey, bool inVkey,
@@ -45,14 +45,14 @@ public:
XPCWidget * inObject, XPCWidget * inObject,
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2); intptr_t inParam2);
private: private:
char mKey; char mKey;
bool mVkey; bool mVkey;
long mMsg; int mMsg;
void * mParam; void * mParam;
bool mConsume; bool mConsume;
@@ -63,7 +63,7 @@ public:
XPCPushButtonMessageAttachment( XPCPushButtonMessageAttachment(
XPWidgetID inWidget, XPWidgetID inWidget,
long inMessage, int inMessage,
void * inParam, void * inParam,
XPCListener * inListener); XPCListener * inListener);
virtual ~XPCPushButtonMessageAttachment(); virtual ~XPCPushButtonMessageAttachment();
@@ -72,12 +72,12 @@ public:
XPCWidget * inObject, XPCWidget * inObject,
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2); intptr_t inParam2);
private: private:
XPWidgetID mWidget; XPWidgetID mWidget;
long mMsg; int mMsg;
void * mParam; void * mParam;
}; };
@@ -86,7 +86,7 @@ public:
XPCSliderMessageAttachment( XPCSliderMessageAttachment(
XPWidgetID inWidget, XPWidgetID inWidget,
long inMessage, int inMessage,
void * inParam, void * inParam,
XPCListener * inListener); XPCListener * inListener);
virtual ~XPCSliderMessageAttachment(); virtual ~XPCSliderMessageAttachment();
@@ -95,12 +95,12 @@ public:
XPCWidget * inObject, XPCWidget * inObject,
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2); intptr_t inParam2);
private: private:
XPWidgetID mWidget; XPWidgetID mWidget;
long mMsg; int mMsg;
void * mParam; void * mParam;
}; };
@@ -110,7 +110,7 @@ public:
XPCCloseButtonMessageAttachment( XPCCloseButtonMessageAttachment(
XPWidgetID inWidget, XPWidgetID inWidget,
long inMessage, int inMessage,
void * inParam, void * inParam,
XPCListener * inListener); XPCListener * inListener);
virtual ~XPCCloseButtonMessageAttachment(); virtual ~XPCCloseButtonMessageAttachment();
@@ -119,12 +119,12 @@ public:
XPCWidget * inObject, XPCWidget * inObject,
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2); intptr_t inParam2);
private: private:
XPWidgetID mWidget; XPWidgetID mWidget;
long mMsg; int mMsg;
void * mParam; void * mParam;
}; };
@@ -138,8 +138,8 @@ public:
XPCWidget * inObject, XPCWidget * inObject,
XPWidgetMessage inMessage, XPWidgetMessage inMessage,
XPWidgetID inWidget, XPWidgetID inWidget,
long inParam1, intptr_t inParam1,
long inParam2); intptr_t inParam2);
}; };

22
xpcPlugin/SDK/CHeaders/XPLM/XPLMDefs.h
View File

@@ -27,7 +27,7 @@
extern "C" { extern "C" {
#endif #endif
#ifdef _WIN32 #if IBM
#include <windows.h> #include <windows.h>
#else #else
#include <stdint.h> #include <stdint.h>
@@ -49,7 +49,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
#ifdef APL #if APL
#if __GNUC__ >= 4 #if __GNUC__ >= 4
#define PLUGIN_API extern "C" __attribute__((visibility("default"))) #define PLUGIN_API extern "C" __attribute__((visibility("default")))
#elif __MACH__ #elif __MACH__
@@ -57,16 +57,16 @@ extern "C" {
#else #else
#define PLUGIN_API extern "C" __declspec(dllexport) #define PLUGIN_API extern "C" __declspec(dllexport)
#endif #endif
#endif #elif IBM
#ifdef _WIN32
#define PLUGIN_API extern "C" __declspec(dllexport) #define PLUGIN_API extern "C" __declspec(dllexport)
#endif #elif LIN
#ifdef LIN
#if __GNUC__ >= 4 #if __GNUC__ >= 4
#define PLUGIN_API extern "C" __attribute__((visibility("default"))) #define PLUGIN_API extern "C" __attribute__((visibility("default")))
#else #else
#define PLUGIN_API extern "C" #define PLUGIN_API extern "C"
#endif #endif
#else
#error "Platform not defined!"
#endif #endif
#else #else
#if APL #if APL
@@ -90,7 +90,7 @@ extern "C" {
#endif #endif
#endif #endif
#ifdef APL #if APL
#if XPLM #if XPLM
#if __GNUC__ >= 4 #if __GNUC__ >= 4
#define XPLM_API __attribute__((visibility("default"))) #define XPLM_API __attribute__((visibility("default")))
@@ -102,15 +102,13 @@ extern "C" {
#else #else
#define XPLM_API #define XPLM_API
#endif #endif
#endif #elif IBM
#ifdef _WIN32
#if XPLM #if XPLM
#define XPLM_API __declspec(dllexport) #define XPLM_API __declspec(dllexport)
#else #else
#define XPLM_API __declspec(dllimport) #define XPLM_API __declspec(dllimport)
#endif #endif
#endif #elif LIN
#ifdef LIN
#if XPLM #if XPLM
#if __GNUC__ >= 4 #if __GNUC__ >= 4
#define XPLM_API __attribute__((visibility("default"))) #define XPLM_API __attribute__((visibility("default")))
@@ -120,6 +118,8 @@ extern "C" {
#else #else
#define XPLM_API #define XPLM_API
#endif #endif
#else
#error "Platform not defined!"
#endif #endif
/*************************************************************************** /***************************************************************************

5
xpcPlugin/SDK/README.txt
View File

@@ -51,6 +51,11 @@ Mach-O if you want to use 2.0 features.
This section contains per-release notes for the history of the X-Plane SDK. This section contains per-release notes for the history of the X-Plane SDK.
X-Plane SDK Release 2.1.3 11/14/13
Fixed XPC Wrappers to use int and intptr_t instead of long. This fixes
crashes for plugins on 64-bit Windows.
X-Plane SDK Release 2.1.2 RC2 1/15/13 X-Plane SDK Release 2.1.2 RC2 1/15/13
Removed headers from frameworks, as they don't work; updated README. Removed headers from frameworks, as they don't work; updated README.