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

Ref T730, removed voice room related funcions from audio context

Browse Source
This commit is contained in:
Klaus Basan
2019-09-25 17:22:56 +02:00
committed by Mat Sutcliffe
parent 81ade55cb5
commit 6071e77b7f
14 changed files with 208 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/blackcore/context/contextaudio.h
View File

@@ -11,20 +11,22 @@
#ifndef BLACKCORE_CONTEXT_CONTEXTAUDIO_H
#define BLACKCORE_CONTEXT_CONTEXTAUDIO_H
#include "blackcore/blackcoreexport.h"
#include "blackcore/context/context.h"
#include "blackcore/corefacade.h"
#include "blackcore/corefacadeconfig.h"
#include "blackcore/blackcoreexport.h"
#include "blackmisc/audio/audiodeviceinfolist.h"
#include "blackmisc/audio/notificationsounds.h"
#include "blackmisc/audio/voiceroom.h"
#include "blackmisc/audio/voiceroomlist.h"
#include "blackmisc/audio/voicesetup.h"
#include "blackmisc/audio/ptt.h"
#include "blackmisc/aviation/callsignset.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/aviation/selcal.h"
#include "blackmisc/identifier.h"
#include "blackmisc/network/userlist.h"
#include "blackmisc/identifier.h"
#include <QObject>
#include <QString>
@@ -82,17 +84,13 @@ namespace BlackCore
virtual ~IContextAudio() override {}
signals:
//! Voice rooms changed
//! \details the flag indicates, whether a room got connected or disconnected
void changedVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &voiceRooms, bool connected);
//! Voice room members changed
void changedVoiceRoomMembers();
//! Audio volume changed
//! \sa setVoiceOutputVolume
void changedAudioVolume(int volume);
//! PTT status in a particular voice client
void ptt(bool active, BlackMisc::Audio::PTTCOM pttcom, const BlackMisc::CIdentifier &identifier);
//! Mute changed
void changedMute(bool muted);
@@ -103,17 +101,11 @@ namespace BlackCore
void changedSelectedAudioDevices(const BlackMisc::Audio::CAudioDeviceInfoList &devices);
public slots:
//! Set voice rooms
virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &voiceRooms) = 0;
//! Leave all voice rooms
virtual void leaveAllVoiceRooms() = 0;
//! Room users
virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnit) const = 0;
//! Audio devices
//! Audio devices @{
virtual BlackMisc::Audio::CAudioDeviceInfoList getAudioDevices() const = 0;
BlackMisc::Audio::CAudioDeviceInfoList getAudioInputDevices() const { return this->getAudioDevices().getInputDevices(); }
BlackMisc::Audio::CAudioDeviceInfoList getAudioOutputDevices() const { return this->getAudioDevices().getOutputDevices(); }
//! @}
//! Audio runs where
virtual BlackMisc::CIdentifier audioRunsWhere() const = 0;
@@ -127,7 +119,7 @@ namespace BlackCore
//! Set current audio device
//! \param audioDevice can be input or audio device
virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDeviceInfo &audioDevice) = 0;
virtual void setCurrentAudioDevices(const BlackMisc::Audio::CAudioDeviceInfo &inputDevice, const BlackMisc::Audio::CAudioDeviceInfo &outputDevice) = 0;
//! Set voice output volume (0..300)
virtual void setVoiceOutputVolume(int volume) = 0;