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

Ref T731, Ref T739, adjusted launcher to only support "STANDALONE" and "DISTRIBUTED"

Browse Source 
* the audio on core/GUI modes are no longer valid
* aligned the core mode enum
This commit is contained in:
Klaus Basan
2019-10-05 23:46:55 +02:00
committed by Mat Sutcliffe
parent bcd97c3a60
commit 9ddb55e79f
6 changed files with 84 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/swiftguistandard/swiftguistdapplication.cpp
View File

@@ -37,7 +37,7 @@ CStatusMessageList CSwiftGuiStdApplication::startHookIn()
// Valid combination?
if (!coreModeStr.isEmpty())
{
if (coreMode == CoreModes::CoreInGuiProcess && !dBusAddress.isEmpty())
if (coreMode == CoreModes::Standalone && !dBusAddress.isEmpty())
{
const CStatusMessage m = CStatusMessage(this, CLogCategory::validation()).
error(u"Inconsistent pair DBus: '%1' and core: '%2'")
@@ -50,13 +50,13 @@ CStatusMessageList CSwiftGuiStdApplication::startHookIn()
CStatusMessageList msgs;
if (!dBusAddress.isEmpty() && coreModeStr.isEmpty())
{
coreMode = CoreModes::CoreExternal; // default
coreMode = CoreModes::Distributed; // 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::CoreExternal)
else if (dBusAddress.isEmpty() && coreMode == CoreModes::Distributed)
{
dBusAddress = CDBusServer::sessionBusAddress(); // a possible default
const CStatusMessage m = CStatusMessage(this, CLogCategory::validation()).
@@ -68,11 +68,11 @@ CStatusMessageList CSwiftGuiStdApplication::startHookIn()
CCoreFacadeConfig runtimeConfig;
switch (coreMode)
{
case CoreModes::CoreExternal:
case CoreModes::Distributed:
runtimeConfig = CCoreFacadeConfig::remote(dBusAddress);
break;
default:
case CoreModes::CoreInGuiProcess:
case CoreModes::Standalone:
runtimeConfig = CCoreFacadeConfig::local(dBusAddress);
break;
}

2
src/swiftguistandard/swiftguistdapplication.h
View File

@@ -44,7 +44,7 @@ private:
QCommandLineOption m_cmdFacadeMode
{
{ "c" , "core" },
QCoreApplication::translate("main", "Core mode: (e)xternal, (g)ui (in GUI process), (l)ocalaudio (external, but local audio)."),
QCoreApplication::translate("main", "Core mode: (d)istributed, (s)tandalone."),
"coremode"
}; //!< Facade startup mode
};