Use nested namespaces (C++17 feature)

This commit is contained in:
Mat Sutcliffe
2021-09-15 21:44:54 +01:00
parent 3f2e5b0b69
commit 57d32da826
1345 changed files with 146075 additions and 150376 deletions

View File

@@ -27,94 +27,88 @@
#include <QTimer>
#include <QDateTime>
namespace BlackCore
namespace BlackCore::Afv::Audio
{
namespace Afv
class CReceiverSampleProvider;
//! Callsign provider
class CCallsignSampleProvider : public BlackSound::SampleProvider::ISampleProvider
{
namespace Audio
{
class CReceiverSampleProvider;
Q_OBJECT
//! Callsign provider
class CCallsignSampleProvider : public BlackSound::SampleProvider::ISampleProvider
{
Q_OBJECT
public:
//! Ctor
CCallsignSampleProvider(const QAudioFormat &audioFormat, const BlackCore::Afv::Audio::CReceiverSampleProvider *receiver, QObject *parent = nullptr);
public:
//! Ctor
CCallsignSampleProvider(const QAudioFormat &audioFormat, const BlackCore::Afv::Audio::CReceiverSampleProvider *receiver, QObject *parent = nullptr);
//! Read samples
int readSamples(QVector<float> &samples, qint64 count) override;
//! Read samples
int readSamples(QVector<float> &samples, qint64 count) override;
//! The callsign
const QString &callsign() const { return m_callsign; }
//! The callsign
const QString &callsign() const { return m_callsign; }
//! Type
const QString &type() const { return m_aircraftType; }
//! Type
const QString &type() const { return m_aircraftType; }
//! Is active?
//! @{
void active(const QString &callsign, const QString &aircraftType);
void activeSilent(const QString &callsign, const QString &aircraftType);
//! @}
//! Is active?
//! @{
void active(const QString &callsign, const QString &aircraftType);
void activeSilent(const QString &callsign, const QString &aircraftType);
//! @}
//! Clean
void clear();
//! Clean
void clear();
//! Add samples
//! @{
void addOpusSamples(const IAudioDto &audioDto, float distanceRatio);
void addSilentSamples(const IAudioDto &audioDto);
//! @}
//! Add samples
//! @{
void addOpusSamples(const IAudioDto &audioDto, float distanceRatio);
void addSilentSamples(const IAudioDto &audioDto);
//! @}
//! Callsign in use
bool inUse() const { return m_inUse; }
//! Callsign in use
bool inUse() const { return m_inUse; }
//! Bypass effects
void setBypassEffects(bool bypassEffects);
//! Bypass effects
void setBypassEffects(bool bypassEffects);
//! Info
QString toQString() const;
//! Info
QString toQString() const;
private:
void timerElapsed();
void idle();
QVector<qint16> decodeOpus(const QByteArray &opusData);
void setEffects(bool noEffects = false);
private:
void timerElapsed();
void idle();
QVector<qint16> decodeOpus(const QByteArray &opusData);
void setEffects(bool noEffects = false);
QAudioFormat m_audioFormat;
QAudioFormat m_audioFormat;
const double m_whiteNoiseGainMin = 0.17; //0.01;
const double m_hfWhiteNoiseGainMin = 0.6; //0.01;
const double m_acBusGainMin = 0.0028; //0.002;
const int m_frameCount = 960;
const int m_idleTimeoutMs = 500;
const double m_whiteNoiseGainMin = 0.17; //0.01;
const double m_hfWhiteNoiseGainMin = 0.6; //0.01;
const double m_acBusGainMin = 0.0028; //0.002;
const int m_frameCount = 960;
const int m_idleTimeoutMs = 500;
QString m_callsign;
QString m_aircraftType;
bool m_inUse = false;
QString m_callsign;
QString m_aircraftType;
bool m_inUse = false;
bool m_bypassEffects = false;
float m_distanceRatio = 1.0;
const CReceiverSampleProvider *m_receiver = nullptr;
BlackSound::SampleProvider::CMixingSampleProvider *m_mixer = nullptr;
BlackSound::SampleProvider::CResourceSoundSampleProvider *m_crackleSoundProvider = nullptr;
BlackSound::SampleProvider::CResourceSoundSampleProvider *m_whiteNoise = nullptr;
BlackSound::SampleProvider::CResourceSoundSampleProvider *m_hfWhiteNoise = nullptr;
BlackSound::SampleProvider::CSawToothGenerator *m_acBusNoise = nullptr;
BlackSound::SampleProvider::CSimpleCompressorEffect *m_simpleCompressorEffect = nullptr;
BlackSound::SampleProvider::CEqualizerSampleProvider *m_voiceEqualizer = nullptr;
BlackSound::SampleProvider::CBufferedWaveProvider *m_audioInput = nullptr;
QTimer *m_timer = nullptr;
bool m_bypassEffects = false;
float m_distanceRatio = 1.0;
const CReceiverSampleProvider *m_receiver = nullptr;
BlackSound::SampleProvider::CMixingSampleProvider *m_mixer = nullptr;
BlackSound::SampleProvider::CResourceSoundSampleProvider *m_crackleSoundProvider = nullptr;
BlackSound::SampleProvider::CResourceSoundSampleProvider *m_whiteNoise = nullptr;
BlackSound::SampleProvider::CResourceSoundSampleProvider *m_hfWhiteNoise = nullptr;
BlackSound::SampleProvider::CSawToothGenerator *m_acBusNoise = nullptr;
BlackSound::SampleProvider::CSimpleCompressorEffect *m_simpleCompressorEffect = nullptr;
BlackSound::SampleProvider::CEqualizerSampleProvider *m_voiceEqualizer = nullptr;
BlackSound::SampleProvider::CBufferedWaveProvider *m_audioInput = nullptr;
QTimer *m_timer = nullptr;
BlackSound::Codecs::COpusDecoder m_decoder;
bool m_lastPacketLatch = false;
QDateTime m_lastSamplesAddedUtc;
bool m_underflow = false;
};
} // ns
} // ns
BlackSound::Codecs::COpusDecoder m_decoder;
bool m_lastPacketLatch = false;
QDateTime m_lastSamplesAddedUtc;
bool m_underflow = false;
};
} // ns
#endif // guard