From 3031e5b648edc73f44ee86a5377c49da1d6394b6 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 4 May 2018 22:07:03 +0200 Subject: [PATCH] Ref T261, set client provider in simulator Needed to obtain client capabilities --- src/blackcore/simulator.h | 6 +- .../simulator/emulated/simulatoremulated.cpp | 3 +- .../simulator/emulated/simulatoremulated.h | 1 + .../emulated/simulatoremulatedfactory.cpp | 4 +- .../emulated/simulatoremulatedfactory.h | 3 +- src/plugins/simulator/fs9/simulatorfs9.cpp | 66 +++++++------------ src/plugins/simulator/fs9/simulatorfs9.h | 21 +++--- .../simulator/fscommon/simulatorfscommon.cpp | 6 +- .../simulator/fscommon/simulatorfscommon.h | 1 + src/plugins/simulator/fsx/simulatorfsx.cpp | 3 +- src/plugins/simulator/fsx/simulatorfsx.h | 12 ++-- .../simulator/fsx/simulatorfsxfactory.cpp | 6 +- .../simulator/fsx/simulatorfsxfactory.h | 3 +- .../fsxcommon/simulatorfsxcommon.cpp | 3 +- .../simulator/fsxcommon/simulatorfsxcommon.h | 12 ++-- src/plugins/simulator/p3d/simulatorp3d.cpp | 3 +- src/plugins/simulator/p3d/simulatorp3d.h | 12 ++-- .../simulator/p3d/simulatorp3dfactory.cpp | 6 +- .../simulator/p3d/simulatorp3dfactory.h | 3 +- .../simulator/xplane/simulatorxplane.cpp | 8 ++- .../simulator/xplane/simulatorxplane.h | 4 +- 21 files changed, 93 insertions(+), 93 deletions(-) diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index f1faded27..1517fb125 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -239,11 +239,12 @@ namespace BlackCore void receivedRequestedElevation(const BlackMisc::Geo::CElevationPlane &plane, const BlackMisc::Aviation::CCallsign &callsign); protected: - //! Default constructor + //! Constructor with all the providers ISimulator(const BlackMisc::Simulation::CSimulatorPluginInfo &pluginInfo, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider, QObject *parent = nullptr); //! Are we connected to the simulator? @@ -344,7 +345,8 @@ namespace BlackCore const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) = 0; + BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider) = 0; //! Simulator listener instance virtual ISimulatorListener *createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) = 0; diff --git a/src/plugins/simulator/emulated/simulatoremulated.cpp b/src/plugins/simulator/emulated/simulatoremulated.cpp index 14ebe7035..832f25d47 100644 --- a/src/plugins/simulator/emulated/simulatoremulated.cpp +++ b/src/plugins/simulator/emulated/simulatoremulated.cpp @@ -34,8 +34,9 @@ namespace BlackSimPlugin IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, IWeatherGridProvider *weatherGridProvider, + IClientProvider *clientProvider, QObject *parent) : - CSimulatorCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, parent) + CSimulatorCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, clientProvider, parent) { Q_ASSERT_X(sApp && sApp->getIContextSimulator(), Q_FUNC_INFO, "Need context"); diff --git a/src/plugins/simulator/emulated/simulatoremulated.h b/src/plugins/simulator/emulated/simulatoremulated.h index 6c3bf2ecb..cd0f13f35 100644 --- a/src/plugins/simulator/emulated/simulatoremulated.h +++ b/src/plugins/simulator/emulated/simulatoremulated.h @@ -43,6 +43,7 @@ namespace BlackSimPlugin BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider, QObject *parent = nullptr); // functions implemented diff --git a/src/plugins/simulator/emulated/simulatoremulatedfactory.cpp b/src/plugins/simulator/emulated/simulatoremulatedfactory.cpp index 760a5867f..ef1f37d7e 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedfactory.cpp +++ b/src/plugins/simulator/emulated/simulatoremulatedfactory.cpp @@ -22,10 +22,10 @@ namespace BlackSimPlugin BlackCore::ISimulator *CSimulatorEmulatedFactory::create(const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) + BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, Network::IClientProvider *clientProvider) { Q_ASSERT(ownAircraftProvider); - return new CSimulatorEmulated(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, this); + return new CSimulatorEmulated(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, clientProvider, this); } BlackCore::ISimulatorListener *CSimulatorEmulatedFactory::createListener(const CSimulatorPluginInfo &info) diff --git a/src/plugins/simulator/emulated/simulatoremulatedfactory.h b/src/plugins/simulator/emulated/simulatoremulatedfactory.h index e995241ac..54351c095 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedfactory.h +++ b/src/plugins/simulator/emulated/simulatoremulatedfactory.h @@ -36,7 +36,8 @@ namespace BlackSimPlugin virtual BlackCore::ISimulator *create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) override; + BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider) override; //! \copydoc BlackCore::ISimulatorFactory::createListener virtual BlackCore::ISimulatorListener *createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) override; diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp index 434e7d85a..9615c8180 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.cpp +++ b/src/plugins/simulator/fs9/simulatorfs9.cpp @@ -28,6 +28,7 @@ using namespace BlackMisc::Aviation; using namespace BlackMisc::Network; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Geo; +using namespace BlackMisc::Network; using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation::FsCommon; using namespace BlackMisc::Weather; @@ -99,15 +100,15 @@ namespace BlackSimPlugin return situation; } - CSimulatorFs9::CSimulatorFs9( - const CSimulatorPluginInfo &info, - const QSharedPointer &fs9Host, - const QSharedPointer &lobbyClient, - IOwnAircraftProvider *ownAircraftProvider, - IRemoteAircraftProvider *remoteAircraftProvider, - IWeatherGridProvider *weatherGridProvider, - QObject *parent) : - CSimulatorFsCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, parent), + CSimulatorFs9::CSimulatorFs9(const CSimulatorPluginInfo &info, + const QSharedPointer &fs9Host, + const QSharedPointer &lobbyClient, + IOwnAircraftProvider *ownAircraftProvider, + IRemoteAircraftProvider *remoteAircraftProvider, + IWeatherGridProvider *weatherGridProvider, + IClientProvider *clientProvider, + QObject *parent) : + CSimulatorFsCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, clientProvider, parent), m_fs9Host(fs9Host), m_lobbyClient(lobbyClient) { @@ -231,34 +232,12 @@ namespace BlackSimPlugin const CTransponder newTransponder = ownAircraft.getTransponder(); bool changed = false; - if (newCom1.getFrequencyActive() != m_simCom1.getFrequencyActive()) - { - changed = true; - - } - if (newCom1.getFrequencyStandby() != m_simCom1.getFrequencyStandby()) - { - changed = true; - } - - if (newCom2.getFrequencyActive() != m_simCom2.getFrequencyActive()) - { - changed = true; - } - if (newCom2.getFrequencyStandby() != m_simCom2.getFrequencyStandby()) - { - changed = true; - } - - if (newTransponder.getTransponderCode() != m_simTransponder.getTransponderCode()) - { - changed = true; - } - - if (newTransponder.getTransponderMode() != m_simTransponder.getTransponderMode()) - { - changed = true; - } + if (newCom1.getFrequencyActive() != m_simCom1.getFrequencyActive()) { changed = true; } + if (newCom1.getFrequencyStandby() != m_simCom1.getFrequencyStandby()) { changed = true; } + if (newCom2.getFrequencyActive() != m_simCom2.getFrequencyActive()) { changed = true; } + if (newCom2.getFrequencyStandby() != m_simCom2.getFrequencyStandby()) { changed = true; } + if (newTransponder.getTransponderCode() != m_simTransponder.getTransponderCode()) { changed = true; } + if (newTransponder.getTransponderMode() != m_simTransponder.getTransponderMode()) { changed = true; } //! \todo KB 8/2017 set FS9 cockpit values @@ -483,19 +462,18 @@ namespace BlackSimPlugin CSimulatorFs9Factory::~CSimulatorFs9Factory() { } - BlackCore::ISimulator *CSimulatorFs9Factory::create( - const CSimulatorPluginInfo &info, - IOwnAircraftProvider *ownAircraftProvider, - IRemoteAircraftProvider *remoteAircraftProvider, - IWeatherGridProvider *weatherGridProvider) + BlackCore::ISimulator *CSimulatorFs9Factory::create(const CSimulatorPluginInfo &info, + IOwnAircraftProvider *ownAircraftProvider, + IRemoteAircraftProvider *remoteAircraftProvider, + IWeatherGridProvider *weatherGridProvider, + IClientProvider *clientProvider) { - return new CSimulatorFs9(info, m_fs9Host, m_lobbyClient, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, this); + return new CSimulatorFs9(info, m_fs9Host, m_lobbyClient, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, clientProvider, this); } BlackCore::ISimulatorListener *CSimulatorFs9Factory::createListener(const CSimulatorPluginInfo &info) { return new CSimulatorFs9Listener(info, m_fs9Host, m_lobbyClient); } - } // namespace } // namespace diff --git a/src/plugins/simulator/fs9/simulatorfs9.h b/src/plugins/simulator/fs9/simulatorfs9.h index 81e695fc4..9cca0a42c 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.h +++ b/src/plugins/simulator/fs9/simulatorfs9.h @@ -39,14 +39,14 @@ namespace BlackSimPlugin public: //! Constructor, parameters as in \sa BlackCore::ISimulatorFactory::create - CSimulatorFs9( - const BlackMisc::Simulation::CSimulatorPluginInfo &info, - const QSharedPointer &fs9Host, - const QSharedPointer &lobbyClient, - BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, - BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, - QObject *parent = nullptr); + CSimulatorFs9(const BlackMisc::Simulation::CSimulatorPluginInfo &info, + const QSharedPointer &fs9Host, + const QSharedPointer &lobbyClient, + BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, + BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, + BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider, + QObject *parent = nullptr); //! Destructor virtual ~CSimulatorFs9() = default; @@ -64,7 +64,6 @@ namespace BlackSimPlugin virtual bool updateOwnSimulatorSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator) override; virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override; virtual void displayTextMessage(const BlackMisc::Network::CTextMessage &message) const override; - virtual bool setInterpolatorMode(BlackMisc::Simulation::CInterpolatorMulti::Mode mode, const BlackMisc::Aviation::CCallsign &callsign) override; //! \@} protected: @@ -149,7 +148,9 @@ namespace BlackSimPlugin const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) override; + BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider + ) override; //! \copydoc BlackCore::ISimulatorFactory::createListener virtual BlackCore::ISimulatorListener *createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) override; diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.cpp b/src/plugins/simulator/fscommon/simulatorfscommon.cpp index a42743f13..9c3e9bf8a 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.cpp +++ b/src/plugins/simulator/fscommon/simulatorfscommon.cpp @@ -20,6 +20,7 @@ using namespace BlackMisc::Geo; using namespace BlackMisc::Network; using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation::FsCommon; +using namespace BlackMisc::Weather; using namespace BlackCore; namespace BlackSimPlugin @@ -30,9 +31,10 @@ namespace BlackSimPlugin const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *renderedAircraftProvider, - Weather::IWeatherGridProvider *weatherGridProvider, + IWeatherGridProvider *weatherGridProvider, + IClientProvider *clientProvider, QObject *parent) : - CSimulatorCommon(info, ownAircraftProvider, renderedAircraftProvider, weatherGridProvider, parent), + CSimulatorCommon(info, ownAircraftProvider, renderedAircraftProvider, weatherGridProvider, clientProvider, parent), m_fsuipc(std::make_unique(this)) { CSimulatorFsCommon::registerHelp(); diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.h b/src/plugins/simulator/fscommon/simulatorfscommon.h index 747597e69..5172184ca 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.h +++ b/src/plugins/simulator/fscommon/simulatorfscommon.h @@ -54,6 +54,7 @@ namespace BlackSimPlugin BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *renderedAircraftProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider, QObject *parent = nullptr); //! Init the internal objects diff --git a/src/plugins/simulator/fsx/simulatorfsx.cpp b/src/plugins/simulator/fsx/simulatorfsx.cpp index f8fd430c2..788078532 100644 --- a/src/plugins/simulator/fsx/simulatorfsx.cpp +++ b/src/plugins/simulator/fsx/simulatorfsx.cpp @@ -27,8 +27,9 @@ namespace BlackSimPlugin IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, IWeatherGridProvider *weatherGridProvider, + IClientProvider *clientProvider, QObject *parent) : - CSimulatorFsxCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, parent) + CSimulatorFsxCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, clientProvider, parent) { this->setDefaultModel( { diff --git a/src/plugins/simulator/fsx/simulatorfsx.h b/src/plugins/simulator/fsx/simulatorfsx.h index 291b90f3e..8d7179782 100644 --- a/src/plugins/simulator/fsx/simulatorfsx.h +++ b/src/plugins/simulator/fsx/simulatorfsx.h @@ -25,12 +25,12 @@ namespace BlackSimPlugin public: //! Constructor, parameters as in \sa BlackCore::ISimulatorFactory::create - CSimulatorFsx( - const BlackMisc::Simulation::CSimulatorPluginInfo &info, - BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, - BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, - QObject *parent = nullptr); + CSimulatorFsx(const BlackMisc::Simulation::CSimulatorPluginInfo &info, + BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, + BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, + BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider, + QObject *parent = nullptr); }; //! Listener for FSX diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.cpp b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp index 043b66546..66bbc12d8 100644 --- a/src/plugins/simulator/fsx/simulatorfsxfactory.cpp +++ b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp @@ -11,6 +11,7 @@ #include "simulatorfsx.h" #include "blackmisc/simulation/simulatorplugininfo.h" +using namespace BlackMisc::Network; using namespace BlackMisc::Simulation; using namespace BlackMisc::Weather; @@ -21,10 +22,11 @@ namespace BlackSimPlugin BlackCore::ISimulator *CSimulatorFsxFactory::create(const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, - IWeatherGridProvider *weatherGridProvider) + IWeatherGridProvider *weatherGridProvider, + IClientProvider *clientProvider) { Q_ASSERT(ownAircraftProvider); - return new CSimulatorFsx(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, this); + return new CSimulatorFsx(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, clientProvider, this); } BlackCore::ISimulatorListener *CSimulatorFsxFactory::createListener(const CSimulatorPluginInfo &info) diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.h b/src/plugins/simulator/fsx/simulatorfsxfactory.h index 5fcf49547..274e9073f 100644 --- a/src/plugins/simulator/fsx/simulatorfsxfactory.h +++ b/src/plugins/simulator/fsx/simulatorfsxfactory.h @@ -36,7 +36,8 @@ namespace BlackSimPlugin virtual BlackCore::ISimulator *create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) override; + BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider) override; //! \copydoc BlackCore::ISimulatorFactory::createListener virtual BlackCore::ISimulatorListener *createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) override; diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index 93354f6e3..eb87b6045 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp @@ -48,8 +48,9 @@ namespace BlackSimPlugin IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, IWeatherGridProvider *weatherGridProvider, + IClientProvider *clientProvider, QObject *parent) : - CSimulatorFsCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, parent) + CSimulatorFsCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, clientProvider, parent) { Q_ASSERT_X(ownAircraftProvider, Q_FUNC_INFO, "Missing provider"); Q_ASSERT_X(remoteAircraftProvider, Q_FUNC_INFO, "Missing provider"); diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h index a4d8a7daa..1756cb9de 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h @@ -104,12 +104,12 @@ namespace BlackSimPlugin public: //! Constructor, parameters as in \sa BlackCore::ISimulatorFactory::create - CSimulatorFsxCommon( - const BlackMisc::Simulation::CSimulatorPluginInfo &info, - BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, - BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, - QObject *parent = nullptr); + CSimulatorFsxCommon(const BlackMisc::Simulation::CSimulatorPluginInfo &info, + BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, + BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, + BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider, + QObject *parent = nullptr); //! Destructor virtual ~CSimulatorFsxCommon(); diff --git a/src/plugins/simulator/p3d/simulatorp3d.cpp b/src/plugins/simulator/p3d/simulatorp3d.cpp index 4b8d34a83..647852357 100644 --- a/src/plugins/simulator/p3d/simulatorp3d.cpp +++ b/src/plugins/simulator/p3d/simulatorp3d.cpp @@ -32,8 +32,9 @@ namespace BlackSimPlugin IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, IWeatherGridProvider *weatherGridProvider, + IClientProvider *clientProvider, QObject *parent) : - CSimulatorFsxCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, parent) + CSimulatorFsxCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, clientProvider, parent) { if (CBuildConfig::isCompiledWithP3DSupport() && CBuildConfig::isRunningOnWindowsNtPlatform() && CBuildConfig::buildWordSize() == 64) { diff --git a/src/plugins/simulator/p3d/simulatorp3d.h b/src/plugins/simulator/p3d/simulatorp3d.h index 413495665..f6315832d 100644 --- a/src/plugins/simulator/p3d/simulatorp3d.h +++ b/src/plugins/simulator/p3d/simulatorp3d.h @@ -25,12 +25,12 @@ namespace BlackSimPlugin public: //! Constructor, parameters as in \sa BlackCore::ISimulatorFactory::create - CSimulatorP3D( - const BlackMisc::Simulation::CSimulatorPluginInfo &info, - BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, - BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, - QObject *parent = nullptr); + CSimulatorP3D(const BlackMisc::Simulation::CSimulatorPluginInfo &info, + BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, + BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, + BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider, + QObject *parent = nullptr); //! \copydoc BlackMisc::Simulation::ISimulationEnvironmentProvider::requestElevation virtual bool requestElevation(const BlackMisc::Geo::ICoordinateGeodetic &reference, const BlackMisc::Aviation::CCallsign &callsign) override; diff --git a/src/plugins/simulator/p3d/simulatorp3dfactory.cpp b/src/plugins/simulator/p3d/simulatorp3dfactory.cpp index 14a0ee6ae..636e7e2a6 100644 --- a/src/plugins/simulator/p3d/simulatorp3dfactory.cpp +++ b/src/plugins/simulator/p3d/simulatorp3dfactory.cpp @@ -13,6 +13,7 @@ using namespace BlackMisc::Simulation; using namespace BlackMisc::Weather; +using namespace BlackMisc::Network; namespace BlackSimPlugin { @@ -21,10 +22,11 @@ namespace BlackSimPlugin BlackCore::ISimulator *CSimulatorP3DFactory::create(const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, - IWeatherGridProvider *weatherGridProvider) + IWeatherGridProvider *weatherGridProvider, + IClientProvider *clientProvider) { Q_ASSERT(ownAircraftProvider); - return new CSimulatorP3D(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, this); + return new CSimulatorP3D(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, clientProvider, this); } BlackCore::ISimulatorListener *CSimulatorP3DFactory::createListener(const CSimulatorPluginInfo &info) diff --git a/src/plugins/simulator/p3d/simulatorp3dfactory.h b/src/plugins/simulator/p3d/simulatorp3dfactory.h index 0a6310280..892b14b12 100644 --- a/src/plugins/simulator/p3d/simulatorp3dfactory.h +++ b/src/plugins/simulator/p3d/simulatorp3dfactory.h @@ -36,7 +36,8 @@ namespace BlackSimPlugin virtual BlackCore::ISimulator *create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) override; + BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider) override; //! \copydoc BlackCore::ISimulatorFactory::createListener virtual BlackCore::ISimulatorListener *createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) override; diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index fda67f55f..6cbf440f1 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -84,8 +84,9 @@ namespace BlackSimPlugin IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, IWeatherGridProvider *weatherGridProvider, + IClientProvider *clientProvider, QObject *parent) : - CSimulatorCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, parent) + CSimulatorCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, clientProvider, parent) { m_watcher = new QDBusServiceWatcher(this); m_watcher->setWatchMode(QDBusServiceWatcher::WatchForUnregistration); @@ -784,9 +785,10 @@ namespace BlackSimPlugin BlackCore::ISimulator *CSimulatorXPlaneFactory::create(const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, - IWeatherGridProvider *weatherGridProvider) + IWeatherGridProvider *weatherGridProvider, + IClientProvider *clientProvider) { - return new CSimulatorXPlane(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, this); + return new CSimulatorXPlane(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, clientProvider, this); } CSimulatorXPlaneListener::CSimulatorXPlaneListener(const CSimulatorPluginInfo &info): ISimulatorListener(info) diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index 9682f4f90..46d3e8058 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -112,6 +112,7 @@ namespace BlackSimPlugin BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider, QObject *parent = nullptr); //! \name ISimulator implementations @@ -257,7 +258,8 @@ namespace BlackSimPlugin virtual BlackCore::ISimulator *create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) override; + BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider) override; //! \copydoc BlackCore::ISimulatorFactory::createListener virtual BlackCore::ISimulatorListener *createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) override { return new CSimulatorXPlaneListener(info); }