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