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

[AFV], Ref T731, Ref T739 remember audio settings in launcher

Browse Source
This commit is contained in:
Klaus Basan
2019-11-28 00:47:42 +01:00
committed by Mat Sutcliffe
parent 386a0ccd5d
commit 8dd0a06c81
5 changed files with 64 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/swiftlauncher/swiftlauncher.cpp
View File

@@ -406,8 +406,13 @@ void CSwiftLauncher::setDefaults()
ui->rb_WindowNormal->setChecked(!setup.useFramelessWindow());
const CLauncherSetup::CoreMode mode = setup.getCoreMode();
ui->rb_SwiftStandalone->setChecked(mode == CLauncherSetup::Standalone ? true : false);
ui->rb_SwiftStandalone->setChecked(mode == CLauncherSetup::Standalone ? true : false);
ui->rb_SwiftDistributed->setChecked(mode == CLauncherSetup::Distributed ? true : false);
const CLauncherSetup::AudioMode audio = setup.getAudioMode();
ui->cb_DisableCoreAudio->setChecked(audio.testFlag(CLauncherSetup::AudioDisableDistributedCoreAudio));
ui->cb_DisableGUIAfv->setChecked(audio.testFlag(CLauncherSetup::AudioDisableDistributedGuiAudio));
ui->cb_DisableSaAfv->setChecked(audio.testFlag(CLauncherSetup::AudioDisableStandaloneAudio));
}
void CSwiftLauncher::saveSetup()
@@ -417,10 +422,18 @@ void CSwiftLauncher::saveSetup()
if (!dBus.isEmpty()) { setup.setDBusAddress(dBus); }
setup.setFramelessWindow(ui->rb_WindowFrameless->isChecked());
setup.setCoreMode(CLauncherSetup::Standalone);
CLauncherSetup::AudioMode audio = CLauncherSetup::AudioNothingDisabled;
audio.setFlag(CLauncherSetup::AudioDisableDistributedCoreAudio, ui->cb_DisableCoreAudio->isChecked());
audio.setFlag(CLauncherSetup::AudioDisableDistributedGuiAudio, ui->cb_DisableGUIAfv->isChecked());
audio.setFlag(CLauncherSetup::AudioDisableStandaloneAudio, ui->cb_DisableSaAfv->isChecked());
setup.setAudioMode(audio);
if (ui->rb_SwiftDistributed->isChecked())
{
setup.setCoreMode(CLauncherSetup::Distributed);
}
const CStatusMessage msg = m_setup.set(setup);
Q_UNUSED(msg)
}
@@ -566,9 +579,9 @@ void CSwiftLauncher::showLogPage()
void CSwiftLauncher::checkRunningApplicationsAndCore()
{
// wait some time before buttons are enabled (allows startup)
if (m_startCoreWaitCycles > 0) { m_startCoreWaitCycles--; }
if (m_startCoreWaitCycles > 0) { m_startCoreWaitCycles--; }
if (m_startMappingToolWaitCycles > 0) { m_startMappingToolWaitCycles--; }
if (m_startGuiWaitCycles > 0) { m_startGuiWaitCycles--; }
if (m_startGuiWaitCycles > 0) { m_startGuiWaitCycles--; }
const CApplicationInfoList runningApps = sGui->getRunningApplications();
const bool foundLocalCore = runningApps.containsApplication(CApplicationInfo::PilotClientCore);