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 T609, adjusted audio context to support changed COM units and muted transmission if muted in COM unit

Browse Source
This commit is contained in:
Klaus Basan
2019-08-04 21:18:01 +02:00
committed by Mat Sutcliffe
parent 90deceae6b
commit 03096f8f7e
3 changed files with 81 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/aviation/selcal.h"
#include "blackmisc/macos/microphoneaccess.h"
#include "blackmisc/identifiable.h"
#include "blackmisc/identifier.h"
#include "blackmisc/network/userlist.h"
#include "blackmisc/settingscache.h"
@@ -62,7 +63,9 @@ namespace BlackCore
namespace Context
{
//! Audio context implementation
class BLACKCORE_EXPORT CContextAudio : public IContextAudio
class BLACKCORE_EXPORT CContextAudio :
public IContextAudio,
public BlackMisc::CIdentifiable
{
Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTAUDIO_INTERFACENAME)
Q_OBJECT
@@ -91,7 +94,7 @@ namespace BlackCore
virtual BlackMisc::Audio::CAudioDeviceInfoList getCurrentAudioDevices() const override;
virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDeviceInfo &audioDevice) override;
virtual void setVoiceOutputVolume(int volume) override;
virtual int getVoiceOutputVolume() const override;
virtual int getVoiceOutputVolume() const override;
virtual void setMute(bool muted) override;
virtual bool isMuted() const override;
virtual void playSelcalTone(const BlackMisc::Aviation::CSelcal &selcal) const override;
@@ -174,6 +177,10 @@ namespace BlackCore
bool isComIntegratedWithSimulator() const;
//! @}
//! Changed cockpit
//! \remark cross context
void xCtxChangedAircraftCockpit(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator);
//! Voice channel by room
QSharedPointer<IVoiceChannel> getVoiceChannelBy(const BlackMisc::Audio::CVoiceRoom &voiceRoom);