flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-03 07:35:48 +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

14
src/blackcore/audio/audiosettings.h
View File

@@ -13,26 +13,12 @@
#define BLACKCORE_AUDIO_SETTINGS_H
#include "blackmisc/settingscache.h"
#include "blackmisc/audio/audiosettings.h"
#include <QString>
namespace BlackCore
{
namespace Audio
{
//! Audio related settings
struct TSettings : public BlackMisc::TSettingTrait<BlackMisc::Audio::CSettings>
{
//! \copydoc BlackMisc::TSettingTrait::key
static const char *key() { return "audio/setup"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("Audio"); return name; }
//! \copydoc BlackMisc::TSettingTrait::isValid
static bool isValid(const BlackMisc::Audio::CSettings &value) { Q_UNUSED(value); return true; }
};
//! Audio input device settings
struct TInputDevice : public BlackMisc::TSettingTrait<QString>
{

6
src/blackcore/context/contextaudioimpl.h
View File

@@ -19,9 +19,9 @@
#include "blackcore/audio/audiosettings.h"
#include "blackcore/voicechannel.h"
#include "blackcore/audiomixer.h"
#include "blackmisc/audio/audiosettings.h"
#include "blackmisc/audio/audiodeviceinfolist.h"
#include "blackmisc/audio/notificationsounds.h"
#include "blackmisc/audio/voiceroom.h"
#include "blackmisc/audio/voiceroomlist.h"
#include "blackmisc/aviation/callsignset.h"
#include "blackmisc/aviation/comsystem.h"
@@ -161,8 +161,8 @@ namespace BlackCore
BlackSound::CSelcalPlayer *m_selcalPlayer = nullptr;
// settings
BlackMisc::CSetting<BlackCore::Audio::TSettings> m_audioSettings { this };
BlackMisc::CSetting<BlackCore::Audio::TInputDevice> m_inputDeviceSetting { this, &CContextAudio::changeDeviceSettings };
BlackMisc::CSetting<BlackMisc::Audio::TSettings> m_audioSettings { this };
BlackMisc::CSetting<BlackCore::Audio::TInputDevice> m_inputDeviceSetting { this, &CContextAudio::changeDeviceSettings };
BlackMisc::CSetting<BlackCore::Audio::TOutputDevice> m_outputDeviceSetting { this, &CContextAudio::changeDeviceSettings };
};
} // namespace

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

20
src/blackmisc/audio/audiosettings.h
View File

@@ -13,6 +13,7 @@
#define BLACKMISC_AUDIO_SETTINGS_H
#include "blackmisc/audio/notificationsounds.h"
#include "blackmisc/settingscache.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/metaclass.h"
#include "blackmisc/statusmessage.h"
@@ -45,6 +46,12 @@ namespace BlackMisc
//! Set notification
void setNotification(CNotificationSounds::Notification notification) { m_notification = static_cast<int>(notification); }
//! Simplified functions @{
bool textMessagePrivate() const { return this->isNotificationFlagSet(CNotificationSounds::NotificationTextMessagePrivate); }
bool textCallsignMentioned() const { return this->isNotificationFlagSet(CNotificationSounds::NotificationTextCallsignMentioned); }
bool pttClick() const { return this->isNotificationFlagSet(CNotificationSounds::PTTClick); }
//! @}
//! Settings value
CStatusMessage value(const QString &path, const QString &command, const CVariant &value, bool &changedFlag);
@@ -63,6 +70,19 @@ namespace BlackMisc
BLACK_METAMEMBER(notification)
);
};
//! Audio related settings
struct TSettings : public TSettingTrait<CSettings>
{
//! \copydoc BlackMisc::TSettingTrait::key
static const char *key() { return "audio/setup"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("Audio"); return name; }
//! \copydoc BlackMisc::TSettingTrait::isValid
static bool isValid(const BlackMisc::Audio::CSettings &value) { Q_UNUSED(value); return true; }
};
} // namespace
} // namespace