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

4
src/blackcore/audiodevice.h
View File

@@ -21,6 +21,7 @@ namespace BlackCore
{
//! Audio Input Device
//! \todo Settings classes to store hardware settings (hardware device)
//! \deprecated will be removed as we use Qt classes now
class BLACKCORE_EXPORT IAudioInputDevice : public QObject
{
Q_OBJECT
@@ -50,6 +51,7 @@ namespace BlackCore
class BLACKCORE_EXPORT CAudioInputDeviceDummy : public IAudioInputDevice
{
Q_OBJECT
public:
//! Constructor
CAudioInputDeviceDummy(QObject *parent = nullptr) : IAudioInputDevice(parent) {}
@@ -102,6 +104,6 @@ namespace BlackCore
//! Get output volume between 0 ... 300%
virtual int getOutputVolume() const = 0;
};
}
} // ns
#endif // guard

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;

54
src/blackcore/context/contextaudioempty.h
View File

@@ -32,28 +32,7 @@ namespace BlackCore
CContextAudioEmpty(CCoreFacade *runtime) : IContextAudio(CCoreFacadeConfig::NotUsed, runtime) {}
public slots:
//! \copydoc IContextAudio::setComVoiceRooms
virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &newRooms) override
{
Q_UNUSED(newRooms);
logEmptyContextWarning(Q_FUNC_INFO);
}
//! \copydoc IContextAudio::getRoomUsers()
virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override
{
Q_UNUSED(comUnitValue);
logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Network::CUserList();
}
//! \copydoc IContextAudio::leaveAllVoiceRooms
virtual void leaveAllVoiceRooms() override
{
logEmptyContextWarning(Q_FUNC_INFO);
}
//! \copydoc IContextAudio::audioRunsWhere()
//! \copydoc IContextAudio::audioRunsWhere
virtual BlackMisc::CIdentifier audioRunsWhere() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
@@ -61,31 +40,32 @@ namespace BlackCore
return i;
}
//! \copydoc IContextAudio::getAudioDevices()
//! \copydoc IContextAudio::getAudioDevices
virtual BlackMisc::Audio::CAudioDeviceInfoList getAudioDevices() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Audio::CAudioDeviceInfoList();
}
//! \copydoc IContextAudio::getCurrentAudioDevices()
//! \copydoc IContextAudio::getCurrentAudioDevices
virtual BlackMisc::Audio::CAudioDeviceInfoList getCurrentAudioDevices() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Audio::CAudioDeviceInfoList();
}
//! \copydoc IContextAudio::setCurrentAudioDevice()
virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDeviceInfo &audioDevice) override
//! \copydoc IContextAudio::setCurrentAudioDevices
virtual void setCurrentAudioDevices(const BlackMisc::Audio::CAudioDeviceInfo &inputDevice, const BlackMisc::Audio::CAudioDeviceInfo &outputDevice) override
{
Q_UNUSED(audioDevice);
Q_UNUSED(inputDevice)
Q_UNUSED(outputDevice)
logEmptyContextWarning(Q_FUNC_INFO);
}
//! \copydoc IContextAudio::setVoiceOutputVolume
virtual void setVoiceOutputVolume(int volume) override
{
Q_UNUSED(volume);
Q_UNUSED(volume)
logEmptyContextWarning(Q_FUNC_INFO);
}
@@ -99,7 +79,7 @@ namespace BlackCore
//! \copydoc IContextAudio::setMute
virtual void setMute(bool muted) override
{
Q_UNUSED(muted);
Q_UNUSED(muted)
logEmptyContextWarning(Q_FUNC_INFO);
}
@@ -113,23 +93,23 @@ namespace BlackCore
//! \copydoc IContextAudio::playSelcalTone()
virtual void playSelcalTone(const BlackMisc::Aviation::CSelcal &selcal) override
{
Q_UNUSED(selcal);
Q_UNUSED(selcal)
logEmptyContextWarning(Q_FUNC_INFO);
}
//! \copydoc IContextAudio::playNotification()
virtual void playNotification(BlackMisc::Audio::CNotificationSounds::NotificationFlag notification, bool considerSettings, int volume = -1) override
{
Q_UNUSED(volume);
Q_UNUSED(notification);
Q_UNUSED(considerSettings);
Q_UNUSED(volume)
Q_UNUSED(notification)
Q_UNUSED(considerSettings)
logEmptyContextWarning(Q_FUNC_INFO);
}
//! \copydoc IContextAudio::enableAudioLoopback()
virtual void enableAudioLoopback(bool enable = true) override
{
Q_UNUSED(enable);
Q_UNUSED(enable)
logEmptyContextWarning(Q_FUNC_INFO);
}
@@ -143,8 +123,8 @@ namespace BlackCore
//! \copydoc IContextAudio::parseCommandLine
virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override
{
Q_UNUSED(commandLine);
Q_UNUSED(originator);
Q_UNUSED(commandLine)
Q_UNUSED(originator)
logEmptyContextWarning(Q_FUNC_INFO);
return false;
}
@@ -159,7 +139,7 @@ namespace BlackCore
//! \copydoc IContextAudio::setVoiceSetup
virtual void setVoiceSetup(const BlackMisc::Audio::CVoiceSetup &setup) override
{
Q_UNUSED(setup);
Q_UNUSED(setup)
logEmptyContextWarning(Q_FUNC_INFO);
}
};

28
src/blackcore/context/contextaudioproxy.cpp
View File

@@ -7,6 +7,7 @@
*/
#include "blackcore/context/contextaudioproxy.h"
#include "blackmisc/audio/ptt.h"
#include "blackmisc/dbus.h"
#include "blackmisc/dbusserver.h"
#include "blackmisc/genericdbusinterface.h"
@@ -36,7 +37,7 @@ namespace BlackCore
// connect signals, asserts when failures
QDBusConnection con = QDBusConnection::sessionBus();
CContextAudioProxy c(CDBusServer::coreServiceName(), con, CCoreFacadeConfig::Remote, nullptr);
Q_UNUSED(c);
Q_UNUSED(c)
}
void CContextAudioProxy::relaySignals(const QString &serviceName, QDBusConnection &connection)
@@ -59,22 +60,14 @@ namespace BlackCore
s = connection.connect(serviceName, IContextAudio::ObjectPath(), IContextAudio::InterfaceName(),
"changedSelectedAudioDevices", this, SIGNAL(changedSelectedAudioDevices(BlackMisc::Audio::CAudioDeviceInfoList)));
Q_ASSERT(s);
Q_UNUSED(s);
s = connection.connect(serviceName, IContextAudio::ObjectPath(), IContextAudio::InterfaceName(),
"ptt", this, SIGNAL(ptt(bool, BlackMisc::Audio::PTTCOM, BlackMisc::CIdentifier)));
Q_ASSERT(s);
Q_UNUSED(s)
this->relayBaseClassSignals(serviceName, connection, IContextAudio::ObjectPath(), IContextAudio::InterfaceName());
}
void CContextAudioProxy::leaveAllVoiceRooms()
{
this->m_dBusInterface->callDBus(QLatin1String("leaveAllVoiceRooms"));
}
BlackMisc::Network::CUserList CContextAudioProxy::getRoomUsers(CComSystem::ComUnit comUnitValue) const
{
return this->m_dBusInterface->callDBusRet<CUserList>(QLatin1String("getRoomUsers"), comUnitValue);
}
CAudioDeviceInfoList CContextAudioProxy::getAudioDevices() const
{
return this->m_dBusInterface->callDBusRet<CAudioDeviceInfoList>(QLatin1String("getAudioDevices"));
@@ -90,14 +83,9 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<CAudioDeviceInfoList>(QLatin1String("getCurrentAudioDevices"));
}
void CContextAudioProxy::setCurrentAudioDevice(const CAudioDeviceInfo &audioDevice)
void CContextAudioProxy::setCurrentAudioDevices(const CAudioDeviceInfo &inputDevice, const CAudioDeviceInfo &outputDevice)
{
this->m_dBusInterface->callDBus(QLatin1String("setCurrentAudioDevice"), audioDevice);
}
void CContextAudioProxy::setComVoiceRooms(const CVoiceRoomList &voiceRooms)
{
this->m_dBusInterface->callDBus(QLatin1String("setComVoiceRooms"), voiceRooms);
this->m_dBusInterface->callDBus(QLatin1String("setCurrentAudioDevices"), inputDevice, outputDevice);
}
void CContextAudioProxy::playSelcalTone(const CSelcal &selcal)

5
src/blackcore/context/contextaudioproxy.h
View File

@@ -63,13 +63,10 @@ namespace BlackCore
// interface overrides
//! \publicsection
//! @{
virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &voiceRooms) override;
virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override;
virtual void leaveAllVoiceRooms() override;
virtual BlackMisc::CIdentifier audioRunsWhere() const override;
virtual BlackMisc::Audio::CAudioDeviceInfoList getAudioDevices() const override;
virtual BlackMisc::Audio::CAudioDeviceInfoList getCurrentAudioDevices() const override;
virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDeviceInfo &audioDevice) override;
virtual void setCurrentAudioDevices(const BlackMisc::Audio::CAudioDeviceInfo &inputDevice, const BlackMisc::Audio::CAudioDeviceInfo &outputDevice) override;
virtual void setVoiceOutputVolume(int volume) override;
virtual int getVoiceOutputVolume() const override;
virtual void setMute(bool muted) override;

4
src/blackcore/corefacade.cpp
View File

@@ -287,12 +287,10 @@ namespace BlackCore
if (m_contextAudio && m_contextAudio->isUsingImplementingObject())
{
Q_ASSERT(m_contextApplication);
c = connect(m_contextApplication, &IContextApplication::fakedSetComVoiceRoom, this->getCContextAudio(), &CContextAudio::setComVoiceRooms, Qt::QueuedConnection);
Q_ASSERT(c);
times.insert("Post setup, connects audio", time.restart());
c = connect(m_contextNetwork, &IContextNetwork::connectionStatusChanged,
this->getCContextAudio(), &CContextAudio::xCtxNetworkConnectionStatusChanged, Qt::QueuedConnection);
Q_ASSERT(c);
times.insert("Post setup, connects audio", time.restart());
}
}