Move xplane bus project into top source directory

refs #211
This commit is contained in:
Roland Winklmeier
2014-04-18 14:36:23 +02:00
parent cdbc635361
commit 15fb87ecd0
5 changed files with 15 additions and 15 deletions

View File

@@ -1,45 +0,0 @@
/* Copyright (C) 2013 VATSIM Community / contributors
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#define _CRT_SECURE_NO_WARNINGS
#include "stub.h"
#include "utils.h"
QSharedPointer<QApplication> g_qApp;
XBus::CStub *g_stub;
PLUGIN_API int XPluginStart(char *o_name, char *o_sig, char *o_desc)
{
std::strcpy(o_name, "X-Bus");
std::strcpy(o_sig, "net.vatsim.XBus");
std::strcpy(o_desc, "Allows pilot client to connect to X-Plane via D-Bus");
return 1;
}
PLUGIN_API void XPluginStop()
{
}
PLUGIN_API int XPluginEnable()
{
QXPlaneMessageHandler::install();
g_qApp = QSharedApplication::sharedInstance();
QXPlaneEventLoop::exec();
g_stub = new XBus::CStub;
return 1;
}
PLUGIN_API void XPluginDisable()
{
delete g_stub;
g_qApp.reset();
}
PLUGIN_API void XPluginReceiveMessage(XPLMPluginID from, long msg, void *param)
{
Q_UNUSED(from);
Q_UNUSED(msg);
Q_UNUSED(param);
}

View File

@@ -1,27 +0,0 @@
/* Copyright (C) 2013 VATSIM Community / contributors
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef BLACKSIM_XBUS_STUB_H
#define BLACKSIM_XBUS_STUB_H
/*!
* \file
*/
/*!
* \namespace XBus
*/
namespace XBus
{
/*!
* stub
*/
class CStub
{
};
}
#endif // guard

View File

@@ -1,149 +0,0 @@
/* Copyright (C) 2013 VATSIM Community / contributors
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef BLACKSIM_XBUS_UTILS_H
#define BLACKSIM_XBUS_UTILS_H
#define _CRT_SECURE_NO_WARNINGS
#include <XPLM/XPLMDefs.h>
#include <XPLM/XPLMPlugin.h>
#include <XPLM/XPLMProcessing.h>
#include <XPLM/XPLMUtilities.h>
#include <QApplication>
#include <QSharedPointer>
#include <cstring>
#include <cstdio>
#include <cstdlib>
/*!
* \file
*/
/*!
* Install a Qt message handler which outputs to the X-Plane debug log.
*/
class QXPlaneMessageHandler
{
QXPlaneMessageHandler();
QXPlaneMessageHandler(const QXPlaneMessageHandler &);
static void handler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{
QByteArray localMsg = msg.toLocal8Bit();
char *buffer = new char[64 + localMsg.size() + std::strlen(context.file) + std::strlen(context.function)];
switch (type) {
case QtDebugMsg:
std::sprintf(buffer, "Debug: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
XPLMDebugString(buffer);
break;
case QtWarningMsg:
std::sprintf(buffer, "Warning: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
XPLMDebugString(buffer);
break;
default:
case QtCriticalMsg:
std::sprintf(buffer, "Error: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
XPLMDebugString(buffer);
break;
case QtFatalMsg:
std::sprintf(buffer, "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
XPLMDebugString(buffer);
std::abort();
}
delete[] buffer;
}
public:
/*!
* Install the handler.
*/
static void install()
{
qInstallMessageHandler(handler);
}
};
/*!
* QApplication subclass used by XBus.
*
* Only one instance of QApplication is allowed per process, so if any other
* X-Plane plugin, completely unrelated to this pilot client, wants to use the
* Qt framework, they can simply copy & paste this class into their project
* and both X-Plane plugins will be able to share a single QApplication safely.
*/
class QSharedApplication : public QApplication
{
Q_OBJECT
QWeakPointer<QApplication> m_weakptr;
QSharedApplication(QSharedPointer<QApplication> &ptr, int argc, char **argv) : QApplication(argc, argv)
{
ptr.reset(this);
m_weakptr = ptr;
}
public:
/*!
* Returns a shared pointer to the QApplication.
*
* The QApplication will not be destroyed while this shared pointer exists.
*/
static QSharedPointer<QApplication> sharedInstance()
{
QSharedPointer<QApplication> ptr;
if (! instance())
{
static int argc = 1;
static char *argv[] = { "X-Plane" };
new QSharedApplication(ptr, argc, argv);
}
if (! instance()->inherits("QSharedApplication"))
{
qFatal("There is an unshared QApplication in another plugin");
}
return static_cast<QSharedApplication*>(instance())->m_weakptr;
}
};
/*!
* Runs the Qt event loop inside the X-Plane event loop.
*/
class QXPlaneEventLoop : public QObject
{
Q_OBJECT
QXPlaneEventLoop(QObject *parent) : QObject(parent)
{
XPLMRegisterFlightLoopCallback(callback, -1, nullptr);
}
~QXPlaneEventLoop()
{
XPLMUnregisterFlightLoopCallback(callback, nullptr);
}
static float callback(float, float, int, void *)
{
QApplication::processEvents();
QApplication::sendPostedEvents();
return -1;
}
public:
/*!
* Registers the X-Plane callback which calls into the Qt event loop,
* unless one was already registered.
*/
static void exec()
{
if (! QApplication::instance()->findChild<QXPlaneEventLoop *>())
{
new QXPlaneEventLoop(QApplication::instance());
}
}
};
#endif // guard

View File

@@ -1,71 +0,0 @@
include (../../../../config.pri)
include (../../../../build.pri)
QT += core gui widgets dbus network
TEMPLATE = lib
CONFIG += shared
CONFIG += blackmisc
LIBS += -lXPLM
DEPENDPATH += . ../../../../src
INCLUDEPATH += . ../../../../src
SOURCES += *.cpp
HEADERS += *.h
#win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib
# Required by X-Plane SDK
DEFINES += XPLM200=1
win32:DEFINES += IBM
linux:DEFINES += LIN
macx:DEFINES += APL
# X-Plane plugins must follow a prescribed filename and directory structure.
# CPU architecture detection copied from externals.pri;
# TODO: refactor so detection is is done in only one place.
TARGET_EXT = .xpl
win32:TARGET = win
linux:TARGET = lin
macx:TARGET = mac
win32:contains(QMAKE_TARGET.arch, x86_64) {
DESTDIR = ../../../../xbus/64
}
win32:contains(QMAKE_TARGET.arch, x86) {
DESTDIR = ../../../../xbus
}
win32-g++ {
WIN_FIND = $$(SYSTEMROOT)\system32\find
MINGW64 = $$system($$QMAKE_CXX -Q --help=target | $$WIN_FIND \"-m64\")
contains(MINGW64,[enabled]) {
DESTDIR = ../../../../xbus/64
}
else {
DESTDIR = ../../../../xbus
}
}
linux-g++ {
GCC64 = $$system($$QMAKE_CXX -Q --help=target | grep m64)
contains(GCC64,[enabled]) {
DESTDIR = ../../../../xbus/64
}
else {
DESTDIR = ../../../../xbus
}
}
linux-g++-64 {
DESTDIR = ../../../../xbus/64
}
linux-g++-32 {
DESTDIR = ../../../../xbus
}
macx {
# a single dylib file contains both 32bit and 64bit binaries
DESTDIR = ../../../../xbus
}
include (../../../../libraries.pri)