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

[AFV] Finalize blocking tone

Browse Source 
Blocking tone is emitted if more than one station is received
in parallel.
This commit is contained in:
Roland Rossgotterer
2019-10-07 10:19:05 +02:00
committed by Mat Sutcliffe
parent ec0a20b1d1
commit b8661918d7
4 changed files with 103 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackcore/afv/audio/receiversampleprovider.cpp
View File

@@ -36,9 +36,9 @@ namespace BlackCore
m_mixer->addMixerInput(voiceInput);
}
// TODO blockTone = new SignalGenerator(WaveFormat.SampleRate, 1) { Gain = 0, Type = SignalGeneratorType.Sin, Frequency = 180 };
// TODO mixer.AddMixerInput(blockTone.ToMono());
// TODO volume = new VolumeSampleProvider(mixer);
m_blockTone = new CSinusGenerator(180, this);
m_mixer->addMixerInput(m_blockTone);
m_volume = new CVolumeSampleProvider(m_mixer);
}
void CReceiverSampleProvider::setBypassEffects(bool value)
@@ -88,12 +88,12 @@ namespace BlackCore
if (numberOfInUseInputs > 1)
{
// blockTone.Frequency = 180;
// blockTone.Gain = blockToneGain;
m_blockTone->setFrequency(180.0);
m_blockTone->setGain(m_blockToneGain);
}
else
{
// blockTone.Gain = 0;
m_blockTone->setGain(0.0);
}
if (m_doClickWhenAppropriate && numberOfInUseInputs == 0)
@@ -127,8 +127,7 @@ namespace BlackCore
}
m_lastNumberOfInUseInputs = numberOfInUseInputs;
// return volume.Read(buffer, offset, count);
return m_mixer->readSamples(samples, count);
return m_volume->readSamples(samples, count);
}
void CReceiverSampleProvider::addOpusSamples(const IAudioDto &audioDto, uint frequency, float distanceRatio)

6
src/blackcore/afv/audio/receiversampleprovider.h
View File

@@ -14,6 +14,8 @@
#include "blackcore/afv/audio/callsignsampleprovider.h"
#include "blacksound/sampleprovider/sampleprovider.h"
#include "blacksound/sampleprovider/mixingsampleprovider.h"
#include "blacksound/sampleprovider/sinusgenerator.h"
#include "blacksound/sampleprovider/volumesampleprovider.h"
#include "blackmisc/aviation/callsignset.h"
#include "blackmisc/audio/audiosettings.h"
@@ -89,9 +91,9 @@ namespace BlackCore
quint16 m_id;
BlackMisc::CSettingReadOnly<BlackMisc::Audio::TSettings> m_audioSettings { this };
// TODO VolumeSampleProvider volume;
BlackSound::SampleProvider::CVolumeSampleProvider *m_volume = nullptr;
BlackSound::SampleProvider::CMixingSampleProvider *m_mixer = nullptr;
// TODO SignalGenerator blockTone;
BlackSound::SampleProvider::CSinusGenerator *m_blockTone = nullptr;
QVector<CallsignSampleProvider *> m_voiceInputs;
QString m_receivingCallsignsString;