flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-12 23:35:33 +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/dbusobject.h
View File

@@ -10,6 +10,7 @@
#define BLACKSIM_XSWIFTBUS_DBUSOBJECT_H
#include "dbusconnection.h"
#include "settings.h"
#include <XPLM/XPLMDisplay.h>
#include <mutex>
#include <deque>
@@ -21,7 +22,7 @@ namespace XSwiftBus
{
public:
//! Constructor
CDBusObject();
CDBusObject(ISettingsProvider *settingsProvider);
//! Destructor
virtual ~CDBusObject();
@@ -79,6 +80,14 @@ namespace XSwiftBus
//! Invoke all pending DBus calls. They will be executed in the calling thread.
void invokeQueuedDBusCalls();
//! Get the settings
CSettings getSettings() const;
//! Set the settings
bool setSettings(const CSettings &s);
static ISettingsProvider *s_settingsProvider; //!< get the settings from here, still protected for the static functions
private:
static void dbusObjectPathUnregisterFunction(DBusConnection *connection, void *data);
static DBusHandlerResult dbusObjectPathMessageFunction(DBusConnection *connection, DBusMessage *message, void *data);
@@ -87,7 +96,7 @@ namespace XSwiftBus
std::string m_interfaceName;
std::string m_objectPath;
std::mutex m_mutex;
std::mutex m_mutex; //!< DBus calls
std::deque<std::function<void()>> m_qeuedDBusCalls;
const DBusObjectPathVTable m_dbusObjectPathVTable = { dbusObjectPathUnregisterFunction, dbusObjectPathMessageFunction, nullptr, nullptr, nullptr, nullptr };