flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 23:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T709, changed to settings provider

Browse Source 
* CPlugin is the provider
* it is "kept" in DBus object for traffic, service, weather
This commit is contained in:
Klaus Basan
2019-07-30 01:01:36 +02:00
committed by Mat Sutcliffe
parent 97926eee26
commit f9c87326fb
10 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/xswiftbus/service.cpp
View File

@@ -6,6 +6,7 @@
* or distributed except according to the terms contained in the LICENSE file.
*/
#include "plugin.h"
#include "service.h"
#include "utils.h"
#include "blackmisc/simulation/xplane/qtfreeutils.h"
@@ -21,11 +22,8 @@ using namespace BlackMisc::Simulation::XPlane::QtFreeUtils;
namespace XSwiftBus
{
CSettings *CService::s_pluginSettings = nullptr;
CService::CService(CSettings *staticSettings) : CDBusObject()
CService::CService(ISettingsProvider *settingsProvider) : CDBusObject(settingsProvider)
{
CService::s_pluginSettings = staticSettings;
updateAirportsInRange();
}
@@ -161,13 +159,14 @@ namespace XSwiftBus
std::string CService::getSettings() const
{
return CService::s_pluginSettings->toXSwiftBusJsonString();
return s_settingsProvider->getSettings().toXSwiftBusJsonString();
}
void CService::setSettings(const std::string &jsonString)
{
CService::s_pluginSettings->parseXSwiftBusString(jsonString);
INFO_LOG("Received settings " + s_pluginSettings->convertToString());
const CSettings s(jsonString);
s_settingsProvider->setSettings(s);
INFO_LOG("Received settings " + s.convertToString());
}
void CService::readAirportsDatabase()