flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-19 03:45:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #241 Move CFsuipc into simulator_fscommon

Browse Source
This commit is contained in:
Roland Winklmeier
2014-07-26 15:01:16 +02:00
parent 113f161bac
commit e49fa083a7
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/simulator/fsx/fsuipc.cpp → src/plugins/simulator/fscommon/fsuipc.cpp
View File

@@ -26,7 +26,7 @@ using namespace BlackMisc::PhysicalQuantities;
namespace BlackSimPlugin namespace BlackSimPlugin
{ {
namespace Fsx namespace FsCommon
{ {
CFsuipc::CFsuipc() : m_connected(false), m_validReadValues(false) CFsuipc::CFsuipc() : m_connected(false), m_validReadValues(false)
@@ -85,6 +85,11 @@ namespace BlackSimPlugin
this->read(); this->read();
} }
void CFsuipc::write()
{
}
void CFsuipc::read() void CFsuipc::read()
{ {
DWORD dwResult; DWORD dwResult;

8
src/plugins/simulator/fsx/fsuipc.h → src/plugins/simulator/fscommon/fsuipc.h
View File

@@ -12,7 +12,7 @@
namespace BlackSimPlugin namespace BlackSimPlugin
{ {
namespace Fsx namespace FsCommon
{ {
//! Class representing a FSUIPC "interface" //! Class representing a FSUIPC "interface"
class CFsuipc class CFsuipc
@@ -37,9 +37,15 @@ namespace BlackSimPlugin
//! Valid read values //! Valid read values
bool validReadValues() const { return m_validReadValues; } bool validReadValues() const { return m_validReadValues; }
//! Get own aircraft from FSUIPC
const BlackMisc::Aviation::CAircraft &getOwnAircraft() const { return m_aircraft; }
//! Process reading and writing variables //! Process reading and writing variables
void process(); void process();
//! Write variables
void write();
//! Error messages //! Error messages
static const QStringList &errorMessages() static const QStringList &errorMessages()
{ {

4
src/plugins/simulator/fsx/plugin_fsx.pro
View File

@@ -9,7 +9,7 @@ TEMPLATE = lib
CONFIG += plugin shared CONFIG += plugin shared
CONFIG += blackmisc blackcore blacksim CONFIG += blackmisc blackcore blacksim
LIBS += -lSimConnect -lFSUIPC_User LIBS += -lsimulator_fscommon -lSimConnect -lFSUIPC_User
# required for FSUIPC # required for FSUIPC
win32:!win32-g++*: QMAKE_LFLAGS += /NODEFAULTLIB:LIBC.lib win32:!win32-g++*: QMAKE_LFLAGS += /NODEFAULTLIB:LIBC.lib
@@ -17,6 +17,8 @@ win32:!win32-g++*: QMAKE_LFLAGS += /NODEFAULTLIB:LIBC.lib
DEPENDPATH += . ../../../../src DEPENDPATH += . ../../../../src
INCLUDEPATH += . ../../../../src INCLUDEPATH += . ../../../../src
LIBS += -ldxguid -lole32
SOURCES += *.cpp SOURCES += *.cpp
HEADERS += *.h HEADERS += *.h

2
src/plugins/simulator/fsx/simulator_fsx.cpp
View File

@@ -48,7 +48,7 @@ namespace BlackSimPlugin
m_simulatorInfo(CSimulatorInfo::FSX()), m_simulatorInfo(CSimulatorInfo::FSX()),
m_simconnectTimerId(-1), m_simconnectTimerId(-1),
m_skipCockpitUpdateCycles(0), m_skipCockpitUpdateCycles(0),
m_fsuipc(new CFsuipc()) m_fsuipc(new FsCommon::CFsuipc())
{ {
CFsxSimulatorSetup setup; CFsxSimulatorSetup setup;
setup.init(); // this fetches important settings on local side setup.init(); // this fetches important settings on local side

4
src/plugins/simulator/fsx/simulator_fsx.h
View File

@@ -8,7 +8,7 @@
#include "simconnect_datadefinition.h" #include "simconnect_datadefinition.h"
#include "simconnect_object.h" #include "simconnect_object.h"
#include "fsuipc.h" #include "../fscommon/fsuipc.h"
#include "blackcore/simulator.h" #include "blackcore/simulator.h"
#include "blackcore/interpolator_linear.h" #include "blackcore/interpolator_linear.h"
#include "blackmisc/avaircraft.h" #include "blackmisc/avaircraft.h"
@@ -218,7 +218,7 @@ namespace BlackSimPlugin
int m_simconnectTimerId; int m_simconnectTimerId;
int m_skipCockpitUpdateCycles; //!< Skip some update cycles to allow changes in simulator cockpit to be set int m_skipCockpitUpdateCycles; //!< Skip some update cycles to allow changes in simulator cockpit to be set
QFutureWatcher<bool> m_watcherConnect; QFutureWatcher<bool> m_watcherConnect;
QScopedPointer<CFsuipc> m_fsuipc; QScopedPointer<FsCommon::CFsuipc> m_fsuipc;
}; };
} }