From 563e5d85beee54f4bc845f4e84207e84ad66ac82 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 13 Oct 2019 23:37:13 +0200 Subject: [PATCH] Style --- src/blackcore/afv/audio/callsignsampleprovider.h | 16 ++++++++++++---- src/blackgui/editors/cockpitcomform.cpp | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/blackcore/afv/audio/callsignsampleprovider.h b/src/blackcore/afv/audio/callsignsampleprovider.h index 2bb249791..6e4fc6a8e 100644 --- a/src/blackcore/afv/audio/callsignsampleprovider.h +++ b/src/blackcore/afv/audio/callsignsampleprovider.h @@ -44,23 +44,31 @@ namespace BlackCore //! Ctor CallsignSampleProvider(const QAudioFormat &audioFormat, const BlackCore::Afv::Audio::CReceiverSampleProvider *receiver, QObject *parent = nullptr); + //! Read samples int readSamples(QVector &samples, qint64 count) override; //! The callsign const QString &callsign() const { return m_callsign; } + //! Type const QString &type() const { return m_type; } + //! Is active? + //! @{ void active(const QString &callsign, const QString &aircraftType); void activeSilent(const QString &callsign, const QString &aircraftType); + //! @} + //! Clean void clear(); void addOpusSamples(const IAudioDto &audioDto, float distanceRatio); void addSilentSamples(const IAudioDto &audioDto); + //! Callsign in use bool inUse() const; + //! Bypass effects void setBypassEffects(bool bypassEffects); private: @@ -84,13 +92,13 @@ namespace BlackCore bool m_bypassEffects = false; float m_distanceRatio = 1.0; const CReceiverSampleProvider *m_receiver = nullptr; - BlackSound::SampleProvider::CMixingSampleProvider *m_mixer = nullptr; + BlackSound::SampleProvider::CMixingSampleProvider *m_mixer = nullptr; BlackSound::SampleProvider::CResourceSoundSampleProvider *m_crackleSoundProvider = nullptr; - BlackSound::SampleProvider::CResourceSoundSampleProvider *m_whiteNoise = nullptr; + BlackSound::SampleProvider::CResourceSoundSampleProvider *m_whiteNoise = nullptr; BlackSound::SampleProvider::CResourceSoundSampleProvider *m_hfWhiteNoise = nullptr; - BlackSound::SampleProvider::CSawToothGenerator *m_acBusNoise = nullptr; + BlackSound::SampleProvider::CSawToothGenerator *m_acBusNoise = nullptr; BlackSound::SampleProvider::CSimpleCompressorEffect *m_simpleCompressorEffect = nullptr; - BlackSound::SampleProvider::CEqualizerSampleProvider *m_voiceEq = nullptr; + BlackSound::SampleProvider::CEqualizerSampleProvider *m_voiceEq = nullptr; BlackSound::SampleProvider::CBufferedWaveProvider *m_audioInput = nullptr; QTimer *m_timer = nullptr; diff --git a/src/blackgui/editors/cockpitcomform.cpp b/src/blackgui/editors/cockpitcomform.cpp index fd6cd5d83..4496b0134 100644 --- a/src/blackgui/editors/cockpitcomform.cpp +++ b/src/blackgui/editors/cockpitcomform.cpp @@ -86,7 +86,7 @@ namespace BlackGui CStatusMessageList CCockpitComForm::validate(bool nested) const { - Q_UNUSED(nested); + Q_UNUSED(nested) CStatusMessageList msgs; return msgs; }