flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-22 13:15:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T437, extern C and use normal pointer

Browse Source
This commit is contained in:
Klaus Basan
2018-11-22 05:03:27 +01:00
parent e9fd49731c
commit 410d77330f
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/simulator/fscommon/fsuipcimpl.cpp
View File

@@ -18,13 +18,17 @@
// bug in FSUIPC_User.h, windows.h not included, so we have to import it first // bug in FSUIPC_User.h, windows.h not included, so we have to import it first
#ifdef SWIFT_USING_FSUIPC32 #ifdef SWIFT_USING_FSUIPC32
extern "C" {
#include "../fsuipc32/IPCuser.h" #include "../fsuipc32/IPCuser.h"
#include "../fsuipc32/FSUIPC_User.h" #include "../fsuipc32/FSUIPC_User.h"
#include "../fsuipc32/NewWeather.h" #include "../fsuipc32/NewWeather.h"
}
#elif SWIFT_USING_FSUIPC64 #elif SWIFT_USING_FSUIPC64
extern "C" {
#include "../fsuipc64/IPCuser64.h" #include "../fsuipc64/IPCuser64.h"
#include "../fsuipc64/FSUIPC_User64.h" #include "../fsuipc64/FSUIPC_User64.h"
#include "../fsuipc64/NewWeather.h" #include "../fsuipc64/NewWeather.h"
}
#endif #endif
#include "blackmisc/simulation/fscommon/bcdconversions.h" #include "blackmisc/simulation/fscommon/bcdconversions.h"
@@ -526,6 +530,7 @@ namespace BlackSimPlugin
void CFsuipc::processWeatherMessages() void CFsuipc::processWeatherMessages()
{ {
if (m_weatherMessageQueue.empty()) { return; } if (m_weatherMessageQueue.empty()) { return; }
if (!m_connected) { return; }
FsuipcWeatherMessage &weatherMessage = m_weatherMessageQueue.first(); FsuipcWeatherMessage &weatherMessage = m_weatherMessageQueue.first();
DWORD dwResult; DWORD dwResult;

8
src/plugins/simulator/fscommon/simulatorfscommon.cpp
View File

@@ -30,13 +30,13 @@ namespace BlackSimPlugin
{ {
CSimulatorFsCommon::CSimulatorFsCommon( CSimulatorFsCommon::CSimulatorFsCommon(
const CSimulatorPluginInfo &info, const CSimulatorPluginInfo &info,
IOwnAircraftProvider *ownAircraftProvider, IOwnAircraftProvider *ownAircraftProvider,
IRemoteAircraftProvider *renderedAircraftProvider, IRemoteAircraftProvider *renderedAircraftProvider,
IWeatherGridProvider *weatherGridProvider, IWeatherGridProvider *weatherGridProvider,
IClientProvider *clientProvider, IClientProvider *clientProvider,
QObject *parent) : QObject *parent) :
CSimulatorPluginCommon(info, ownAircraftProvider, renderedAircraftProvider, weatherGridProvider, clientProvider, parent), CSimulatorPluginCommon(info, ownAircraftProvider, renderedAircraftProvider, weatherGridProvider, clientProvider, parent),
m_fsuipc(std::make_unique<CFsuipc>(this)) m_fsuipc(new CFsuipc(this))
{ {
CSimulatorFsCommon::registerHelp(); CSimulatorFsCommon::registerHelp();
} }

6
src/plugins/simulator/fscommon/simulatorfscommon.h
View File

@@ -79,9 +79,9 @@ namespace BlackSimPlugin
//! Register help //! Register help
static void registerHelp(); static void registerHelp();
std::unique_ptr<CFsuipc> m_fsuipc; //!< FSUIPC CFsuipc *m_fsuipc = nullptr; //!< FSUIPC
bool m_useFsuipc = false; //!< use FSUIPC bool m_useFsuipc = false; //!< use FSUIPC
bool m_simPaused = false; //!< Simulator paused? bool m_simPaused = false; //!< Simulator paused?
bool m_simTimeSynced = false; //!< Time synchronized? bool m_simTimeSynced = false; //!< Time synchronized?
BlackMisc::PhysicalQuantities::CTime m_syncTimeOffset; //!< time offset BlackMisc::PhysicalQuantities::CTime m_syncTimeOffset; //!< time offset
BlackMisc::Aviation::CAirportList m_airportsInRangeFromSimulator; //!< airports in range of own aircraft BlackMisc::Aviation::CAirportList m_airportsInRangeFromSimulator; //!< airports in range of own aircraft