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

Ref T494, moved audio settings Trait directly info BlackMisc settings file

Browse Source
This commit is contained in:
Klaus Basan
2018-12-31 10:55:38 +01:00
committed by Mat Sutcliffe
parent 13647329f9
commit 90b893c62a
5 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/components/audiosetupcomponent.h
View File

@@ -13,7 +13,7 @@
#define BLACKGUI_AUDIOSETUPCOMPONENT_H
#include "blackgui/blackguiexport.h"
#include "blackcore/audio/audiosettings.h"
#include "blackmisc/audio/audiosettings.h"
#include "blackmisc/audio/audiodeviceinfolist.h"
#include "blackmisc/settingscache.h"
@@ -72,7 +72,7 @@ namespace BlackGui
BlackMisc::Audio::CNotificationSounds::NotificationFlag checkBoxToFlag(const QCheckBox *cb) const;
QScopedPointer<Ui::CAudioSetupComponent> ui;
BlackMisc::CSetting<BlackCore::Audio::TSettings> m_audioSettings { this, &CAudioSetupComponent::reloadSettings };
BlackMisc::CSetting<BlackMisc::Audio::TSettings> m_audioSettings { this, &CAudioSetupComponent::reloadSettings };
};
} // namespace
} // namespace

3
src/blackgui/components/copysettingsandcachescomponent.h
View File

@@ -30,6 +30,7 @@
#include "blackmisc/simulation/settings/modelsettings.h"
#include "blackmisc/network/data/lastserver.h"
#include "blackmisc/network/settings/serversettings.h"
#include "blackmisc/audio/audiosettings.h"
#include "blackmisc/directories.h"
#include "blackmisc/applicationinfo.h"
@@ -124,7 +125,7 @@ namespace BlackGui
BlackMisc::CSetting<Settings::TextMessageSettings> m_settingsTextMessage { this };
BlackMisc::CSetting<BlackCore::Application::TEnabledSimulators> m_settingsEnabledSimulators { this };
BlackMisc::CSetting<BlackCore::Application::TActionHotkeys> m_settingsActionHotkeys { this };
BlackMisc::CSetting<BlackCore::Audio::TSettings> m_settingsAudio { this };
BlackMisc::CSetting<BlackMisc::Audio::TSettings> m_settingsAudio { this };
BlackMisc::CSetting<BlackMisc::Settings::TDirectorySettings> m_settingsDirectories { this };
BlackMisc::CSetting<BlackMisc::Network::Settings::TTrafficServers> m_settingsNetworkServers { this };
BlackMisc::CSetting<BlackMisc::Simulation::Settings::TSimulatorFsx> m_settingsSimulatorFsx { this }; //!< FSX settings