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

refactor: Rename BlackSound to swift::sound

Browse Source
This commit is contained in:
Lars Toenning
2024-11-10 13:28:33 +01:00
parent 685f455eab
commit 5982296856
101 changed files with 224 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackcore/afv/audio/callsignsampleprovider.cpp
View File

@@ -5,8 +5,8 @@
#include "blackcore/afv/audio/callsigndelaycache.h"
#include "blackcore/afv/audio/receiversampleprovider.h"
#include "blacksound/sampleprovider/samples.h"
#include "blacksound/audioutilities.h"
#include "sound/sampleprovider/samples.h"
#include "sound/audioutilities.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/metadatautils.h"
#include "config/buildconfig.h"
@@ -17,7 +17,7 @@
#include <QStringBuilder>
using namespace BlackMisc;
using namespace BlackSound::SampleProvider;
using namespace swift::sound::sample_provider;
using namespace swift::config;
namespace BlackCore::Afv::Audio
@@ -136,7 +136,7 @@ namespace BlackCore::Afv::Audio
setEffects();
const QVector<qint16> audio = decodeOpus(audioDto.audio);
m_audioInput->addSamples(BlackSound::convertFromShortToFloat(audio));
m_audioInput->addSamples(swift::sound::convertFromShortToFloat(audio));
m_lastPacketLatch = audioDto.lastPacket;
if (audioDto.lastPacket && !m_underflow) { CallsignDelayCache::instance().success(m_callsign); }
m_lastSamplesAddedUtc = QDateTime::currentDateTimeUtc();

36
src/blackcore/afv/audio/callsignsampleprovider.h
View File

@@ -7,14 +7,14 @@
#define BLACKCORE_AFV_AUDIO_CALLSIGNSAMPLEPROVIDER_H
#include "blackcore/afv/dto.h"
#include "blacksound/sampleprovider/pinknoisegenerator.h"
#include "blacksound/sampleprovider/bufferedwaveprovider.h"
#include "blacksound/sampleprovider/mixingsampleprovider.h"
#include "blacksound/sampleprovider/equalizersampleprovider.h"
#include "blacksound/sampleprovider/sawtoothgenerator.h"
#include "blacksound/sampleprovider/simplecompressoreffect.h"
#include "blacksound/sampleprovider/resourcesoundsampleprovider.h"
#include "blacksound/codecs/opusdecoder.h"
#include "sound/sampleprovider/pinknoisegenerator.h"
#include "sound/sampleprovider/bufferedwaveprovider.h"
#include "sound/sampleprovider/mixingsampleprovider.h"
#include "sound/sampleprovider/equalizersampleprovider.h"
#include "sound/sampleprovider/sawtoothgenerator.h"
#include "sound/sampleprovider/simplecompressoreffect.h"
#include "sound/sampleprovider/resourcesoundsampleprovider.h"
#include "sound/codecs/opusdecoder.h"
#include <QAudioFormat>
#include <QSoundEffect>
@@ -27,7 +27,7 @@ namespace BlackCore::Afv::Audio
class CReceiverSampleProvider;
//! Callsign provider
class CCallsignSampleProvider : public BlackSound::SampleProvider::ISampleProvider
class CCallsignSampleProvider : public swift::sound::sample_provider::ISampleProvider
{
Q_OBJECT
@@ -89,17 +89,17 @@ namespace BlackCore::Afv::Audio
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;
swift::sound::sample_provider::CMixingSampleProvider *m_mixer = nullptr;
swift::sound::sample_provider::CResourceSoundSampleProvider *m_crackleSoundProvider = nullptr;
swift::sound::sample_provider::CResourceSoundSampleProvider *m_whiteNoise = nullptr;
swift::sound::sample_provider::CResourceSoundSampleProvider *m_hfWhiteNoise = nullptr;
swift::sound::sample_provider::CSawToothGenerator *m_acBusNoise = nullptr;
swift::sound::sample_provider::CSimpleCompressorEffect *m_simpleCompressorEffect = nullptr;
swift::sound::sample_provider::CEqualizerSampleProvider *m_voiceEqualizer = nullptr;
swift::sound::sample_provider::CBufferedWaveProvider *m_audioInput = nullptr;
QTimer *m_timer = nullptr;
BlackSound::Codecs::COpusDecoder m_decoder;
swift::sound::codecs::COpusDecoder m_decoder;
bool m_lastPacketLatch = false;
QDateTime m_lastSamplesAddedUtc;
bool m_underflow = false;

4
src/blackcore/afv/audio/input.cpp
View File

@@ -4,7 +4,7 @@
//! \file
#include "blackcore/afv/audio/input.h"
#include "blacksound/audioutilities.h"
#include "sound/audioutilities.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/verify.h"
@@ -16,7 +16,7 @@
using namespace BlackMisc;
using namespace BlackMisc::Audio;
using namespace BlackSound;
using namespace swift::sound;
namespace BlackCore::Afv::Audio
{

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

@@ -6,8 +6,8 @@
#ifndef BLACKCORE_AFV_AUDIO_AUDIO_INPUT_H
#define BLACKCORE_AFV_AUDIO_AUDIO_INPUT_H
#include "blacksound/sampleprovider/bufferedwaveprovider.h"
#include "blacksound/codecs/opusencoder.h"
#include "sound/sampleprovider/bufferedwaveprovider.h"
#include "sound/codecs/opusencoder.h"
#include "blackmisc/audio/audiodeviceinfo.h"
#ifdef Q_OS_MAC
@@ -137,7 +137,7 @@ namespace BlackCore::Afv::Audio
static constexpr qint64 c_frameSize = 960;
int m_sampleRate = 0;
BlackSound::Codecs::COpusEncoder m_encoder;
swift::sound::codecs::COpusEncoder m_encoder;
QScopedPointer<QAudioSource> m_audioInput;
BlackMisc::Audio::CAudioDeviceInfo m_device;
QAudioFormat m_inputFormat;

6
src/blackcore/afv/audio/output.cpp
View File

@@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "blackcore/afv/audio/output.h"
#include "blacksound/audioutilities.h"
#include "sound/audioutilities.h"
#include "blackmisc/metadatautils.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/verify.h"
@@ -13,8 +13,8 @@
using namespace BlackMisc;
using namespace BlackMisc::Audio;
using namespace BlackSound;
using namespace BlackSound::SampleProvider;
using namespace swift::sound;
using namespace swift::sound::sample_provider;
namespace BlackCore::Afv::Audio
{

8
src/blackcore/afv/audio/output.h
View File

@@ -6,7 +6,7 @@
#ifndef BLACKCORE_AFV_AUDIO_OUTPUT_H
#define BLACKCORE_AFV_AUDIO_OUTPUT_H
#include "blacksound/sampleprovider/sampleprovider.h"
#include "sound/sampleprovider/sampleprovider.h"
#include "blackmisc/audio/audiodeviceinfo.h"
#include <QObject>
@@ -29,7 +29,7 @@ namespace BlackCore::Afv::Audio
public:
//! Ctor
CAudioOutputBuffer(BlackSound::SampleProvider::ISampleProvider *sampleProvider, QObject *parent);
CAudioOutputBuffer(swift::sound::sample_provider::ISampleProvider *sampleProvider, QObject *parent);
//! Set the format
void setAudioFormat(const QAudioFormat &format) { m_outputFormat = format; }
@@ -51,7 +51,7 @@ namespace BlackCore::Afv::Audio
virtual qint64 writeData(const char *data, qint64 len) override;
private:
BlackSound::SampleProvider::ISampleProvider *m_sampleProvider = nullptr; //!< related provider
swift::sound::sample_provider::ISampleProvider *m_sampleProvider = nullptr; //!< related provider
static constexpr int SampleCountPerEvent = 4800;
QAudioFormat m_outputFormat;
@@ -77,7 +77,7 @@ namespace BlackCore::Afv::Audio
}
//! Start output
void start(const BlackMisc::Audio::CAudioDeviceInfo &outputDevice, BlackSound::SampleProvider::ISampleProvider *sampleProvider);
void start(const BlackMisc::Audio::CAudioDeviceInfo &outputDevice, swift::sound::sample_provider::ISampleProvider *sampleProvider);
//! Stop output
void stop();

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

@@ -6,8 +6,8 @@
#include "blackcore/afv/audio/receiversampleprovider.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/metadatautils.h"
#include "blacksound/sampleprovider/resourcesoundsampleprovider.h"
#include "blacksound/sampleprovider/samples.h"
#include "sound/sampleprovider/resourcesoundsampleprovider.h"
#include "sound/sampleprovider/samples.h"
#include <QDebug>
#include <QStringBuilder>
@@ -15,7 +15,7 @@
using namespace BlackMisc;
using namespace BlackMisc::Audio;
using namespace BlackMisc::Aviation;
using namespace BlackSound::SampleProvider;
using namespace swift::sound::sample_provider;
namespace BlackCore::Afv::Audio
{

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

@@ -7,10 +7,10 @@
#define BLACKCORE_AFV_AUDIO_RECEIVERSAMPLEPROVIDER_H
#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 "sound/sampleprovider/sampleprovider.h"
#include "sound/sampleprovider/mixingsampleprovider.h"
#include "sound/sampleprovider/sinusgenerator.h"
#include "sound/sampleprovider/volumesampleprovider.h"
#include "blackmisc/logcategories.h"
#include "blackmisc/aviation/callsignset.h"
@@ -28,7 +28,7 @@ namespace BlackCore::Afv::Audio
};
//! A sample provider
class CReceiverSampleProvider : public BlackSound::SampleProvider::ISampleProvider
class CReceiverSampleProvider : public swift::sound::sample_provider::ISampleProvider
{
Q_OBJECT
@@ -57,7 +57,7 @@ namespace BlackCore::Afv::Audio
void setMute(bool value);
//! @}
//! \copydoc BlackSound::SampleProvider::ISampleProvider::readSamples
//! \copydoc swift::sound::sample_provider::ISampleProvider::readSamples
virtual int readSamples(QVector<float> &samples, qint64 count) override;
//! @{
@@ -100,9 +100,9 @@ namespace BlackCore::Afv::Audio
quint16 m_id;
BlackMisc::CSettingReadOnly<BlackMisc::Audio::TSettings> m_audioSettings { this };
BlackSound::SampleProvider::CVolumeSampleProvider *m_volume = nullptr;
BlackSound::SampleProvider::CMixingSampleProvider *m_mixer = nullptr;
BlackSound::SampleProvider::CSinusGenerator *m_blockTone = nullptr;
swift::sound::sample_provider::CVolumeSampleProvider *m_volume = nullptr;
swift::sound::sample_provider::CMixingSampleProvider *m_mixer = nullptr;
swift::sound::sample_provider::CSinusGenerator *m_blockTone = nullptr;
QVector<CCallsignSampleProvider *> m_voiceInputs;
qint64 m_lastLogMessage = -1;

2
src/blackcore/afv/audio/soundcardsampleprovider.cpp
View File

@@ -7,7 +7,7 @@
using namespace swift::config;
using namespace BlackMisc;
using namespace BlackSound::SampleProvider;
using namespace swift::sound::sample_provider;
namespace BlackCore::Afv::Audio
{

10
src/blackcore/afv/audio/soundcardsampleprovider.h
View File

@@ -6,8 +6,8 @@
#ifndef BLACKCORE_AFV_AUDIO_SOUNDCARDSAMPLEPROVIDER_H
#define BLACKCORE_AFV_AUDIO_SOUNDCARDSAMPLEPROVIDER_H
#include "blacksound/sampleprovider/sampleprovider.h"
#include "blacksound/sampleprovider/mixingsampleprovider.h"
#include "sound/sampleprovider/sampleprovider.h"
#include "sound/sampleprovider/mixingsampleprovider.h"
#include "blackcore/afv/audio/receiversampleprovider.h"
#include "blackmisc/aviation/callsignset.h"
@@ -17,7 +17,7 @@
namespace BlackCore::Afv::Audio
{
//! Soundcard sample
class CSoundcardSampleProvider : public BlackSound::SampleProvider::ISampleProvider
class CSoundcardSampleProvider : public swift::sound::sample_provider::ISampleProvider
{
Q_OBJECT
@@ -34,7 +34,7 @@ namespace BlackCore::Afv::Audio
//! Update PTT
void pttUpdate(bool active, const QVector<TxTransceiverDto> &txTransceivers);
//! \copydoc BlackSound::SampleProvider::ISampleProvider::readSamples
//! \copydoc swift::sound::sample_provider::ISampleProvider::readSamples
virtual int readSamples(QVector<float> &samples, qint64 count) override;
//! Add OPUS samples
@@ -58,7 +58,7 @@ namespace BlackCore::Afv::Audio
private:
QAudioFormat m_waveFormat;
BlackSound::SampleProvider::CMixingSampleProvider *m_mixer = nullptr;
swift::sound::sample_provider::CMixingSampleProvider *m_mixer = nullptr;
QVector<CReceiverSampleProvider *> m_receiverInputs;
QVector<quint16> m_receiverIDs;
};