flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #205, using DBus address with runtime

Browse Source 
# added further CRuntimeConfigs for remote audio
# fixed delete as in https://dev.vatsim-germany.org/issues/199 13
# fixed left-over from Proxy to server signals refs #199
This commit is contained in:
Klaus Basan
2014-04-12 02:57:23 +02:00
parent 7a70b6939a
commit 9f2e3a7c9d
2 changed files with 54 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/blackcore/context_runtime.cpp
View File

@@ -233,34 +233,31 @@ namespace BlackCore
// upfront reading of settings, as DBus server already relies on settings
CContextSettings *settings = nullptr;
QString dbusServerAddress;
QString dbusAddress;
if (config.hasDBusAddress()) dbusAddress = config.getDBusAddress(); // bootstrap / explicit
if (config.hasLocalSettings())
{
settings = new CContextSettings(config.getModeSettings(), this);
if (settings) settings->read();
dbusServerAddress = settings->getNetworkSettings().getDBusServerAddress();
if (dbusAddress.isEmpty()) dbusAddress = settings->getNetworkSettings().getDBusServerAddress();
}
// DBus
if (config.requiresDBusSever()) this->initDBusServer(dbusServerAddress);
if (config.requiresDBusConnection()) this->initDBusConnection();
if (config.requiresDBusSever()) this->initDBusServer(dbusAddress);
if (config.requiresDBusConnection())
{
this->initDBusConnection(dbusAddress);
Q_ASSERT(this->m_dbusConnection.isConnected());
}
// contexts
switch (config.getModeSettings())
{
case CRuntimeConfig::Local:
this->m_contextSettings = settings;
break;
case CRuntimeConfig::LocalInDbusServer:
{
this->m_contextSettings = settings->registerWithDBus(this->m_dbusServer);
QDBusConnection *con = new QDBusConnection(this->m_dbusServer->getDBusConnection());
con->connect(BlackCore::CDBusServer::ServiceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(),
"widgetGuiStarting", this->m_contextSettings, SIGNAL(widgetGuiStarting()));
con->connect(BlackCore::CDBusServer::ServiceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(),
"widgetGuiTerminating", this->m_contextSettings, SIGNAL(widgetGuiTerminating()));
}
Q_ASSERT(settings);
this->m_contextSettings = settings->registerWithDBus(this->m_dbusServer);
break;
case CRuntimeConfig::Remote:
this->m_contextSettings = new BlackCore::CContextSettingsProxy(BlackCore::CDBusServer::ServiceName, this->m_dbusConnection, config.getModeSettings(), this);
@@ -364,7 +361,7 @@ namespace BlackCore
disconnect(this);
// unregister all from DBus
this->m_dbusServer->unregisterAllObjects();
if (this->m_dbusServer) this->m_dbusServer->unregisterAllObjects();
// handle contexts
if (this->getIContextApplication())
@@ -373,12 +370,14 @@ namespace BlackCore
this->getIContextApplication()->setOutputRedirectionLevel(IContextApplication::RedirectNone);
this->getIContextApplication()->setStreamingForRedirectedOutputLevel(IContextApplication::RedirectNone);
CContextApplicationBase::resetOutputRedirection();
this->getIContextApplication()->deleteLater();
}
if (this->getIContextSimulator())
{
// TODO: disconnect from simulator
disconnect(this->getIContextSimulator());
this->getIContextSimulator()->deleteLater();
}
// log off from network, if connected
@@ -386,10 +385,19 @@ namespace BlackCore
{
disconnect(this->getIContextNetwork());
this->getIContextNetwork()->disconnectFromNetwork();
this->getIContextNetwork()->deleteLater();
}
if (this->getIContextAudio()) disconnect(this->getIContextAudio());
if (this->getIContextSettings()) disconnect(this->getIContextAudio());
if (this->getIContextAudio())
{
disconnect(this->getIContextAudio());
this->getIContextAudio()->deleteLater();
}
if (this->getIContextSettings())
{
disconnect(this->getIContextSettings());
this->getIContextSettings()->deleteLater();
}
// mark contexts as invalid
// they will be deleted by the parent object (this runtime)
@@ -412,10 +420,15 @@ namespace BlackCore
this->m_logSignalConnections.remove(name);
}
void CRuntime::initDBusConnection()
void CRuntime::initDBusConnection(const QString &address)
{
if (this->m_initDBusConnection) return;
this->m_dbusConnection = QDBusConnection::sessionBus();
if (address.isEmpty() || address == CDBusServer::sessionDBusServer())
this->m_dbusConnection = QDBusConnection::sessionBus();
else if (address == CDBusServer::systemDBusServer())
this->m_dbusConnection = QDBusConnection::sessionBus();
else
this->m_dbusConnection = QDBusConnection::connectToPeer(address, "BlackBoxRuntime");
}
IContextNetwork *CRuntime::getIContextNetwork()
@@ -516,21 +529,35 @@ namespace BlackCore
this->m_simulator == Remote);
}
const CRuntimeConfig &CRuntimeConfig::forCore()
const CRuntimeConfig &CRuntimeConfig::forCoreAllLocalInDBus(const QString &dbusBootstrapAddress)
{
static CRuntimeConfig cfg = CRuntimeConfig(CRuntimeConfig(CRuntimeConfig::LocalInDbusServer));
static CRuntimeConfig cfg = CRuntimeConfig(CRuntimeConfig(CRuntimeConfig::LocalInDbusServer, dbusBootstrapAddress));
return cfg;
}
const CRuntimeConfig &CRuntimeConfig::local()
const CRuntimeConfig &CRuntimeConfig::forCoreAllLocalInDBusNoAudio(const QString &dbusBootstrapAddress)
{
static CRuntimeConfig cfg = CRuntimeConfig(CRuntimeConfig(CRuntimeConfig::Local));
static CRuntimeConfig cfg = CRuntimeConfig(CRuntimeConfig(CRuntimeConfig::LocalInDbusServer, dbusBootstrapAddress));
cfg.m_audio = CRuntimeConfig::NotUsed;
return cfg;
}
const CRuntimeConfig &CRuntimeConfig::remote()
const CRuntimeConfig &CRuntimeConfig::local(const QString &dbusBootstrapAddress)
{
static CRuntimeConfig cfg = CRuntimeConfig(CRuntimeConfig(CRuntimeConfig::Remote));
static CRuntimeConfig cfg = CRuntimeConfig(CRuntimeConfig(CRuntimeConfig::Local, dbusBootstrapAddress));
return cfg;
}
const CRuntimeConfig &CRuntimeConfig::remote(const QString &dbusBootstrapAddress)
{
static CRuntimeConfig cfg = CRuntimeConfig(CRuntimeConfig(CRuntimeConfig::Remote, dbusBootstrapAddress));
return cfg;
}
const CRuntimeConfig &CRuntimeConfig::remoteLocalAudio(const QString &dbusBootstrapAddress)
{
static CRuntimeConfig cfg = CRuntimeConfig(CRuntimeConfig(CRuntimeConfig::Remote, dbusBootstrapAddress));
cfg.m_audio = CRuntimeConfig::Local;
return cfg;
}
}

3
src/blackcore/context_runtime.h
View File

@@ -184,9 +184,8 @@ namespace BlackCore
IContextSimulator *m_contextSimulator;
QMultiMap<QString, QMetaObject::Connection> m_logSignalConnections;
//! initialization of DBus connection (where applicable)
void initDBusConnection();
void initDBusConnection(const QString &address);
//! initialization of DBus connection (where applicable)
void initDBusServer(const QString &dBusAddress);