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 T739, removed no longer used audio proxy functions (slots)

Browse Source
This commit is contained in:
Klaus Basan
2019-10-05 00:12:21 +02:00
committed by Mat Sutcliffe
parent b3d8eddb26
commit 2a7633dc31
2 changed files with 4 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,14 +42,9 @@ namespace BlackCore
void CContextAudioProxy::relaySignals(const QString &serviceName, QDBusConnection &connection)
{
/**
bool s = connection.connect(serviceName, IContextAudio::ObjectPath(), IContextAudio::InterfaceName(),
"changedVoiceRooms", this, SIGNAL(changedVoiceRooms(BlackMisc::Audio::CVoiceRoomList, bool)));
Q_ASSERT(s);
s = connection.connect(serviceName, IContextAudio::ObjectPath(), IContextAudio::InterfaceName(),
"changedVoiceRoomMembers", this, SIGNAL(changedVoiceRoomMembers()));
Q_ASSERT(s);
s = connection.connect(serviceName, IContextAudio::ObjectPath(), IContextAudio::InterfaceName(),
"changedAudioVolume", this, SIGNAL(changedAudioVolume(int)));
"changedAudioVolume", this, SIGNAL(changedAudioVolume(int)));
Q_ASSERT(s);
s = connection.connect(serviceName, IContextAudio::ObjectPath(), IContextAudio::InterfaceName(),
"changedMute", this, SIGNAL(changedMute(bool)));
@@ -64,83 +59,10 @@ namespace BlackCore
"ptt", this, SIGNAL(ptt(bool, BlackMisc::Audio::PTTCOM, BlackMisc::CIdentifier)));
Q_ASSERT(s);
Q_UNUSED(s)
**/
this->relayBaseClassSignals(serviceName, connection, IContextAudio::ObjectPath(), IContextAudio::InterfaceName());
}
CAudioDeviceInfoList CContextAudioProxy::getAudioDevices() const
{
return this->m_dBusInterface->callDBusRet<CAudioDeviceInfoList>(QLatin1String("getAudioDevices"));
}
CIdentifier CContextAudioProxy::audioRunsWhere() const
{
return this->m_dBusInterface->callDBusRet<CIdentifier>(QLatin1String("audioRunsWhere"));
}
CAudioDeviceInfoList CContextAudioProxy::getCurrentAudioDevices() const
{
return this->m_dBusInterface->callDBusRet<CAudioDeviceInfoList>(QLatin1String("getCurrentAudioDevices"));
}
void CContextAudioProxy::setCurrentAudioDevices(const CAudioDeviceInfo &inputDevice, const CAudioDeviceInfo &outputDevice)
{
this->m_dBusInterface->callDBus(QLatin1String("setCurrentAudioDevices"), inputDevice, outputDevice);
}
void CContextAudioProxy::playSelcalTone(const CSelcal &selcal)
{
this->m_dBusInterface->callDBus(QLatin1String("playSelcalTone"), selcal);
}
void CContextAudioProxy::playNotification(CNotificationSounds::NotificationFlag notification, bool considerSettings, int volume)
{
this->m_dBusInterface->callDBus(QLatin1String("playNotification"), notification, considerSettings, volume);
}
void CContextAudioProxy::setVoiceOutputVolume(int volume)
{
this->m_dBusInterface->callDBus(QLatin1String("setVoiceOutputVolume"), volume);
}
int CContextAudioProxy::getVoiceOutputVolume() const
{
return this->m_dBusInterface->callDBusRet<int>(QLatin1String("getVoiceOutputVolume"));
}
void CContextAudioProxy::setMute(bool muted)
{
this->m_dBusInterface->callDBus(QLatin1String("setMute"), muted);
}
bool CContextAudioProxy::isMuted() const
{
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("isMuted"));
}
void CContextAudioProxy::enableAudioLoopback(bool enable)
{
this->m_dBusInterface->callDBus(QLatin1String("enableAudioLoopback"), enable);
}
bool CContextAudioProxy::isAudioLoopbackEnabled() const
{
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("isAudioLoopbackEnabled"));
}
bool CContextAudioProxy::parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator)
{
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("parseCommandLine"), commandLine, originator);
}
CVoiceSetup CContextAudioProxy::getVoiceSetup() const
{
return this->m_dBusInterface->callDBusRet<CVoiceSetup>(QLatin1String("getVoiceSetup"));
}
void CContextAudioProxy::setVoiceSetup(const CVoiceSetup &setup)
{
this->m_dBusInterface->callDBus(QLatin1String("setVoiceSetup"), setup);
}
} // namespace
} // namespace

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

@@ -19,8 +19,6 @@
#include "blackcore/corefacadeconfig.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"
#include "blackmisc/aviation/selcal.h"
@@ -63,21 +61,7 @@ namespace BlackCore
// interface overrides
//! \publicsection
//! @{
virtual BlackMisc::CIdentifier audioRunsWhere() const override;
virtual BlackMisc::Audio::CAudioDeviceInfoList getAudioDevices() const override;
virtual BlackMisc::Audio::CAudioDeviceInfoList getCurrentAudioDevices() const 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;
virtual bool isMuted() const override;
virtual void playSelcalTone(const BlackMisc::Aviation::CSelcal &selcal) override;
virtual void playNotification(BlackMisc::Audio::CNotificationSounds::NotificationFlag notification, bool considerSettings, int volume = -1) override;
virtual void enableAudioLoopback(bool enable = true) override;
virtual bool isAudioLoopbackEnabled() const override;
virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override;
virtual BlackMisc::Audio::CVoiceSetup getVoiceSetup() const override;
virtual void setVoiceSetup(const BlackMisc::Audio::CVoiceSetup &setup) override;
// ------ functions GO HERE -------
//! @}
private: