From 72e350bc3c5faa0d8c406b3c2a28af9e7570342d Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Wed, 25 Jun 2014 19:12:33 +0100 Subject: [PATCH] integration refs #267 fix compile error in simulator_xplane introduced by commit:426dd4a0 --- src/plugins/simulator/xplane/simulator_xplane.cpp | 14 +++++++++++--- src/plugins/simulator/xplane/simulator_xplane.h | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/plugins/simulator/xplane/simulator_xplane.cpp b/src/plugins/simulator/xplane/simulator_xplane.cpp index 03f162300..7171c9bc6 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.cpp +++ b/src/plugins/simulator/xplane/simulator_xplane.cpp @@ -86,7 +86,7 @@ namespace BlackSimPlugin m_traffic = new CXBusTrafficProxy(m_conn, this); if (m_service->isValid() && m_traffic->isValid() && m_traffic->initialize()) { - connect(m_service, &CXBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::aircraftModelChanged); + connect(m_service, &CXBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::emitAircraftModelChanged); m_watcher->setConnection(m_conn); emit statusChanged(ISimulator::Connected); return true; @@ -126,7 +126,7 @@ namespace BlackSimPlugin { delete m_service; m_service = new CXBusServiceProxy(m_conn, this); - connect(m_service, &CXBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::aircraftModelChanged); + connect(m_service, &CXBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::emitAircraftModelChanged); } else if (serviceName == CXBusTrafficProxy::InterfaceName()) { @@ -148,6 +148,14 @@ namespace BlackSimPlugin emit statusChanged(ISimulator::Disconnected); } + void CSimulatorXPlane::emitAircraftModelChanged(const QString &path, const QString &filename, const QString &livery, const QString &icao) + { + emit aircraftModelChanged({ path, true }); + Q_UNUSED(filename); + Q_UNUSED(livery); + Q_UNUSED(icao); + } + // convert xplane squawk mode to swift squawk mode BlackMisc::Aviation::CTransponder::TransponderMode xpdrMode(int xplaneMode, bool ident) { @@ -191,7 +199,7 @@ namespace BlackSimPlugin BlackMisc::Network::CAircraftModel CSimulatorXPlane::getAircraftModel() const { if (! isConnected()) { return {}; } - return m_xplaneData.aircraftModelPath; + return { m_xplaneData.aircraftModelPath, true }; } bool CSimulatorXPlane::updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft) diff --git a/src/plugins/simulator/xplane/simulator_xplane.h b/src/plugins/simulator/xplane/simulator_xplane.h index 9335ab5c4..616c653b2 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.h +++ b/src/plugins/simulator/xplane/simulator_xplane.h @@ -77,6 +77,7 @@ namespace BlackSimPlugin private slots: void serviceRegistered(const QString &serviceName); void serviceUnregistered(); + void emitAircraftModelChanged(const QString &path, const QString &filename, const QString &livery, const QString &icao); void fastTimerTimeout(); void slowTimerTimeout();