Remove all obsolete vatlib voice classes

This commit is contained in:
Roland Rossgotterer
2019-10-02 12:22:17 +02:00
committed by Mat Sutcliffe
parent c759d45bb0
commit 8656131eb1
12 changed files with 1 additions and 462 deletions

View File

@@ -13,7 +13,6 @@
#include "blackcoreexport.h"
#include "contextaudio.h"
#include "voice.h"
// clazy:excludeall=const-signal-or-slot

View File

@@ -12,9 +12,7 @@
#include "blackcore/context/contextownaircraft.h" // for COM integration
#include "blackcore/context/contextsimulator.h" // for COM intergration
#include "blackcore/application.h"
#include "blackcore/audiodevice.h"
#include "blackcore/corefacade.h"
#include "blackcore/voice.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/audio/audiodeviceinfo.h"
#include "blackmisc/audio/notificationsounds.h"
@@ -303,29 +301,6 @@ namespace BlackCore
this->setVoiceTransmission(enabled, COMActive);
}
void CContextAudio::onConnectionStatusChanged(
IVoiceChannel::ConnectionStatus oldStatus,
IVoiceChannel::ConnectionStatus newStatus)
{
Q_UNUSED(oldStatus)
switch (newStatus)
{
case IVoiceChannel::Connected:
break;
case IVoiceChannel::Disconnecting: break;
case IVoiceChannel::Connecting: break;
case IVoiceChannel::ConnectingFailed:
case IVoiceChannel::DisconnectedError:
CLogMessage(this).warning(u"Voice channel disconnecting error");
Q_FALLTHROUGH();
case IVoiceChannel::Disconnected:
break;
default:
break;
}
}
void CContextAudio::changeDeviceSettings()
{
const QString inputDeviceName = m_inputDeviceSetting.get();

View File

@@ -15,8 +15,6 @@
#include "blackcore/audio/audiosettings.h"
#include "blackcore/actionbind.h"
#include "blackcore/corefacadeconfig.h"
#include "blackcore/voicechannel.h"
#include "blackcore/audiomixer.h"
#include "blackcore/blackcoreexport.h"
#include "blackcore/afv/clients/afvclient.h"
#include "blackmisc/audio/audiosettings.h"
@@ -57,11 +55,6 @@ namespace BlackMisc
namespace BlackCore
{
class CCoreFacade;
class IAudioInputDevice;
class IAudioMixer;
class IAudioOutputDevice;
class IVoice;
class IVoiceChannel;
namespace Context
{
@@ -122,10 +115,6 @@ namespace BlackCore
CContextAudio *registerWithDBus(BlackMisc::CDBusServer *server);
private:
//! \copydoc IVoice::connectionStatusChanged
//! \sa IContextAudio::changedVoiceRooms
void onConnectionStatusChanged(IVoiceChannel::ConnectionStatus oldStatus, IVoiceChannel::ConnectionStatus newStatus);
//! Enable/disable voice transmission, nornally used with hotkey @{
void setVoiceTransmission(bool enable, BlackMisc::Audio::PTTCOM com);
void setVoiceTransmissionCom1(bool enabled);