Ref T709, added DBus signatures and use CSettings class in service class

* CSettings objects will be shared among all services (traffic, weather, service)
* It is "global" for plugin
This commit is contained in:
Klaus Basan
2019-07-25 16:34:27 +02:00
committed by Mat Sutcliffe
parent 94f519961b
commit f6690136f2
10 changed files with 118 additions and 45 deletions

View File

@@ -16,6 +16,7 @@
#include "datarefs.h"
#include "terrainprobe.h"
#include "menus.h"
#include "settings.h"
#include "XPMPMultiplayer.h"
#include "XPLMCamera.h"
#include <XPLM/XPLMDisplay.h>
@@ -36,7 +37,7 @@ namespace XSwiftBus
{
public:
//! Constructor
CTraffic();
CTraffic(CSettings &settings);
//! Destructor
~CTraffic() override;
@@ -146,6 +147,7 @@ namespace XSwiftBus
bool m_initialized = false;
bool m_enabledMultiplayer = false;
CTerrainProbe m_terrainProbe;
CSettings &m_pluginSettings;
void emitSimFrame();
void emitPlaneAdded(const std::string &callsign);
@@ -182,7 +184,6 @@ namespace XSwiftBus
const std::string &livery_, const std::string &modelName_);
};
std::unordered_map<std::string, Plane *> m_planesByCallsign;
std::unordered_map<void *, Plane *> m_planesById;
std::vector<std::string> m_followPlaneViewSequence;