flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 17:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T709, change XPlane driver to TXSwiftBusSettings, send/receive functions

Browse Source
This commit is contained in:
Klaus Basan
2019-07-26 02:27:42 +02:00
committed by Mat Sutcliffe
parent 60305d461f
commit 49a9a767a3
2 changed files with 62 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/simulator/xplane/simulatorxplane.h
View File

@@ -165,6 +165,7 @@ namespace BlackSimPlugin
void serviceUnregistered();
private:
//! Mode
enum DBusMode
{
Session,
@@ -219,14 +220,19 @@ namespace BlackSimPlugin
const QDoubleList &elevationsMeters, const QDoubleList &verticalOffsetsMeters);
//! @}
//! Dsiconnect from DBus
//! Disconnect from DBus
void disconnectFromDBus();
//! Send/receive settings @{
bool sendXSwiftBusSettings();
bool receiveXSwiftBusSettings();
//! @}
DBusMode m_dbusMode;
BlackMisc::CSettingReadOnly<BlackMisc::Simulation::Settings::TXSwiftBusServer> m_xswiftbusServerSetting { this };
BlackMisc::CSetting<BlackMisc::Simulation::Settings::TXSwiftBusSettings> m_xSwiftBusServerSettings { this };
static constexpr qint64 TimeoutAdding = 10000;
QDBusConnection m_dBusConnection { "default" };
QDBusServiceWatcher *m_watcher { nullptr };
QDBusConnection m_dBusConnection { "default" };
QDBusServiceWatcher *m_watcher { nullptr };
CXSwiftBusServiceProxy *m_serviceProxy { nullptr };
CXSwiftBusTrafficProxy *m_trafficProxy { nullptr };
CXSwiftBusWeatherProxy *m_weatherProxy { nullptr };
@@ -242,7 +248,7 @@ namespace BlackSimPlugin
XPlaneData m_xplaneData; //!< XPlane data
// statistics
qint64 m_statsAddMaxTimeMs = -1;
qint64 m_statsAddMaxTimeMs = -1;
qint64 m_statsAddCurrentTimeMs = -1;
//! Reset the XPlane data
@@ -281,11 +287,12 @@ namespace BlackSimPlugin
void checkConnectionCommon();
void serviceRegistered(const QString &serviceName);
void xSwiftBusServerSettingChanged();
void onXSwiftBusServerSettingChanged();
QTimer m_timer { this };
QDBusConnection m_conn { "default" };
BlackMisc::CSettingReadOnly<BlackMisc::Simulation::Settings::TXSwiftBusServer> m_xswiftbusServerSetting { this, &CSimulatorXPlaneListener::xSwiftBusServerSettingChanged };
QDBusConnection m_DBusConnection { "default" };
QString m_dBusServerAddress;
BlackMisc::CSettingReadOnly<BlackMisc::Simulation::Settings::TXSwiftBusSettings> m_xSwiftBusServerSettings { this, &CSimulatorXPlaneListener::onXSwiftBusServerSettingChanged };
};
//! Factory for creating CSimulatorXPlane instance