flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-03 15:45:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add simple config file support to XSwiftBus

Browse Source 
This adds a simple configuration file to XSwiftbus. So far, only the
xswiftbus DBus server is configured.

ref T291
This commit is contained in:
Roland Winklmeier
2018-07-30 11:01:19 +02:00
committed by Klaus Basan
parent 9b1b39e3a4
commit ce0b63f8f1
6 changed files with 238 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/xswiftbus/plugin.cpp
View File

@@ -36,6 +36,8 @@ namespace XSwiftBus
m_planeViewSubMenu = m_menu.subMenu("Follow Plane View");
planeViewOwnAircraftMenuItem = m_planeViewSubMenu.item("Own Aircraft", [this] { switchToOwnAircraftView(); });
readConfig();
/*m_dbusThread = std::thread([this]()
{
while(!m_shouldStop)
@@ -55,6 +57,15 @@ namespace XSwiftBus
if (m_dbusThread.joinable()) { m_dbusThread.join(); }
}
void CPlugin::readConfig()
{
initXPlanePath();
auto configFilePath = g_xplanePath + "Resources" + g_sep + "plugins" + g_sep + "xswiftbus" + g_sep + "xswiftbus.conf";
m_pluginConfig.setFilePath(configFilePath);
m_pluginConfig.parse();
m_pluginConfig.print();
}
void CPlugin::startServer(CDBusConnection::BusType bus)
{
(void) bus;
@@ -67,12 +78,13 @@ namespace XSwiftBus
m_traffic->setPlaneViewMenu(m_planeViewSubMenu);
if (m_useDBusP2P)
if (m_pluginConfig.getDBusMode() == CConfig::DBusP2P)
{
m_dbusP2PServer = std::make_unique<CDBusServer>();
// FIXME: make listen address configurable
m_dbusP2PServer->listen("tcp:host=127.0.0.1,port=45000");
std::string listenAddress = "tcp:host=" + m_pluginConfig.getDBusAddress() + ",port=" + std::to_string(m_pluginConfig.getDBusPort());
m_dbusP2PServer->listen(listenAddress);
m_dbusP2PServer->setDispatcher(&m_dbusDispatcher);
m_dbusP2PServer->setNewConnectionFunc([this](const std::shared_ptr<CDBusConnection> &conn)