flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 13:36:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T730, removed voice vatlib

Browse Source
This commit is contained in:
Klaus Basan
2019-09-29 02:57:24 +02:00
committed by Mat Sutcliffe
parent 5f6aebebe8
commit c1470f6069
9 changed files with 7 additions and 1020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blackcore/context/contextaudioimpl.cpp
View File

@@ -15,12 +15,10 @@
#include "blackcore/audiodevice.h"
#include "blackcore/corefacade.h"
#include "blackcore/voice.h"
#include "blackcore/vatsim/voicevatlib.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/audio/audiodeviceinfo.h"
#include "blackmisc/audio/notificationsounds.h"
#include "blackmisc/audio/audiosettings.h"
#include "blackmisc/audio/voiceroomlist.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/compare.h"
#include "blackmisc/dbusserver.h"
@@ -61,13 +59,6 @@ namespace BlackCore
m_voiceClient(("https://voice1.vatsim.uk"))
{
/**
initVoiceChannels();
initInputDevice();
initOutputDevice();
initAudioMixer();
**/
this->setVoiceOutputVolume(m_audioSettings.getThreadLocal().getOutVolume());
m_selcalPlayer = new CSelcalPlayer(QAudioDeviceInfo::defaultOutputDevice(), this);
@@ -251,8 +242,9 @@ namespace BlackCore
void CContextAudio::setVoiceSetup(const CVoiceSetup &setup)
{
// could be recycled for some AFV setup
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
// if (m_voice) { m_voice->setVoiceSetup(setup); }
Q_UNUSED(setup)
}
CVoiceSetup CContextAudio::getVoiceSetup() const
@@ -450,23 +442,19 @@ namespace BlackCore
void CContextAudio::xCtxChangedAircraftCockpit(const CSimulatedAircraft &aircraft, const CIdentifier &originator)
{
Q_UNUSED(aircraft)
Q_UNUSED(originator)
/**
if (CIdentifiable::isMyIdentifier(originator)) { return; }
const bool integrated = this->isComIntegratedWithSimulator();
if (integrated)
{
// set as in cockpit
const bool com1Rec = aircraft.getCom1System().isReceiveEnabled();
const bool com2Rec = aircraft.getCom2System().isReceiveEnabled();
// m_audioMixer->makeOrRemoveConnection(IAudioMixer::InputVoiceChannel1, IAudioMixer::OutputDevice1, com1Rec);
// m_audioMixer->makeOrRemoveConnection(IAudioMixer::InputVoiceChannel2, IAudioMixer::OutputDevice1, com2Rec);
}
else
{
// reset
// m_audioMixer->makeMixerConnectionIfNotExisting(IAudioMixer::InputVoiceChannel1, IAudioMixer::OutputDevice1);
// m_audioMixer->makeMixerConnectionIfNotExisting(IAudioMixer::InputVoiceChannel2, IAudioMixer::OutputDevice1);
}
**/
}
void CContextAudio::xCtxNetworkConnectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)