flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T730, added settings in AFV client

Browse Source
This commit is contained in:
Klaus Basan
2019-09-22 23:58:49 +02:00
committed by Mat Sutcliffe
parent 7c765654c0
commit 6b19ed665e
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackcore/afv/clients/afvclient.cpp
View File

@@ -19,6 +19,7 @@ using namespace BlackMisc;
using namespace BlackMisc::Audio;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Simulation;
using namespace BlackSound;
using namespace BlackSound::SampleProvider;
namespace BlackCore
@@ -405,6 +406,12 @@ namespace BlackCore
return {};
}
void CAfvClient::onSettingsChanged()
{
CSettings audioSettings = m_audioSettings.get();
}
void CAfvClient::updateTransceiversFromContext(const CSimulatedAircraft &aircraft, const CIdentifier &originator)
{
Q_UNUSED(originator)

13
src/blackcore/afv/clients/afvclient.h
View File

@@ -11,18 +11,20 @@
#ifndef BLACKCORE_AFV_CLIENT_AFVCLIENT_H
#define BLACKCORE_AFV_CLIENT_AFVCLIENT_H
#include "blackcore/context/contextownaircraft.h"
#include "blackcore/afv/connection/clientconnection.h"
#include "blackcore/afv/audio/input.h"
#include "blackcore/afv/audio/output.h"
#include "blackcore/afv/audio/soundcardsampleprovider.h"
#include "blackcore/afv/dto.h"
#include "blackcore/context/contextownaircraft.h"
#include "blackcore/blackcoreexport.h"
#include "blackmisc/audio/ptt.h"
#include "blacksound/sampleprovider/volumesampleprovider.h"
#include "blackmisc/settingscache.h"
#include "blackmisc/audio/audiosettings.h"
#include "blackmisc/audio/ptt.h"
#include <QAudioDeviceInfo>
#include <QDateTime>
#include <QAudioInput>
@@ -127,6 +129,7 @@ namespace BlackCore
QString getReceivingCallsignsCom2();
void input_OpusDataAvailable();
void onSettingsChanged();
void updateTransceivers();
void updateTransceiversFromContext(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator);
@@ -164,9 +167,11 @@ namespace BlackCore
QVector<TransceiverDto> m_transceivers;
QSet<quint16> m_enabledTransceivers;
Audio::InputVolumeStreamArgs m_inputVolumeStream;
Audio::InputVolumeStreamArgs m_inputVolumeStream;
Audio::OutputVolumeStreamArgs m_outputVolumeStream;
BlackMisc::CSetting<BlackMisc::Audio::TSettings> m_audioSettings { this, &CAfvClient::onSettingsChanged };
void initWithContext();
static bool hasContext();

1
src/blackmisc/audio/settings/voicesettings.h
View File

@@ -22,6 +22,7 @@ namespace BlackMisc
namespace Settings
{
//! Voice settings
//! \deprecated Voice VATLIB specifics
struct TVoiceSetup : public TSettingTrait<CVoiceSetup>
{
//! \copydoc BlackMisc::TSettingTrait::key