flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-24 09:54:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T739, use correct (new) core modes / removed old modes

Browse Source
This commit is contained in:
Klaus Basan
2019-10-05 00:22:04 +02:00
committed by Mat Sutcliffe
parent 66ea77d25f
commit cfead08b13
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/swiftguistandard/swiftguistdapplication.cpp
View File

@@ -50,13 +50,13 @@ CStatusMessageList CSwiftGuiStdApplication::startHookIn()
CStatusMessageList msgs;
if (!dBusAddress.isEmpty() && coreModeStr.isEmpty())
{
coreMode = CoreModes::CoreExternalAudioGui; // default
coreMode = CoreModes::CoreExternal; // default
const CStatusMessage m = CStatusMessage(this, CLogCategory::validation()).
info(u"No DBus address, setting core mode: '%1'")
<< CoreModes::coreModeToString(coreMode);
msgs.push_back(m);
}
else if (dBusAddress.isEmpty() && (coreMode == CoreModes::CoreExternalCoreAudio || coreMode == CoreModes::CoreExternalAudioGui))
else if (dBusAddress.isEmpty() && coreMode == CoreModes::CoreExternal)
{
dBusAddress = CDBusServer::sessionBusAddress(); // a possible default
const CStatusMessage m = CStatusMessage(this, CLogCategory::validation()).
@@ -68,12 +68,9 @@ CStatusMessageList CSwiftGuiStdApplication::startHookIn()
CCoreFacadeConfig runtimeConfig;
switch (coreMode)
{
case CoreModes::CoreExternalCoreAudio:
case CoreModes::CoreExternal:
runtimeConfig = CCoreFacadeConfig::remote(dBusAddress);
break;
case CoreModes::CoreExternalAudioGui:
runtimeConfig = CCoreFacadeConfig::remoteLocalAudio(dBusAddress);
break;
default:
case CoreModes::CoreInGuiProcess:
runtimeConfig = CCoreFacadeConfig::local(dBusAddress);