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

[AFV] Ref T739, unified callsign functions in CAfvClient

Browse Source 
* improved CallsignSet from QStringList
* renamed the functions which just return a string
* added functions for CCallsignSet
This commit is contained in:
Klaus Basan
2019-10-21 23:51:47 +02:00
parent ca60dbfa4d
commit a63fe0dc21
11 changed files with 90 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,8 +62,10 @@ namespace BlackCore
//! Clean
void clear();
//! Add samples @{
void addOpusSamples(const IAudioDto &audioDto, float distanceRatio);
void addSilentSamples(const IAudioDto &audioDto);
//! @}
//! Callsign in use
bool inUse() const;

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

@@ -32,8 +32,8 @@ namespace BlackCore
//! Arguments
struct TransceiverReceivingCallsignsChangedArgs
{
quint16 transceiverID;
QStringList receivingCallsigns;
quint16 transceiverID; //!< transceiver id
QStringList receivingCallsigns; //!< callsigns
};
//! A sample provider

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

@@ -169,11 +169,16 @@ namespace BlackCore
}
}
QString CSoundcardSampleProvider::getReceivingCallsigns(quint16 transceiverID) const
QString CSoundcardSampleProvider::getReceivingCallsignsString(quint16 transceiverID) const
{
return m_receiverInputs.at(transceiverID)->getReceivingCallsignsString();
}
BlackMisc::Aviation::CCallsignSet CSoundcardSampleProvider::getReceivingCallsigns(quint16 transceiverID) const
{
return m_receiverInputs.at(transceiverID)->getReceivingCallsigns();
}
} // ns
} // ns
} // ns

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

@@ -14,6 +14,7 @@
#include "blacksound/sampleprovider/sampleprovider.h"
#include "blacksound/sampleprovider/mixingsampleprovider.h"
#include "blackcore/afv/audio/receiversampleprovider.h"
#include "blackmisc/aviation/callsignset.h"
#include <QAudioFormat>
#include <QObject>
@@ -52,7 +53,10 @@ namespace BlackCore
void updateRadioTransceivers(const QVector<TransceiverDto> &radioTransceivers);
//! Receiving callsign as single string
QString getReceivingCallsigns(quint16 transceiverID) const;
QString getReceivingCallsignsString(quint16 transceiverID) const;
//! Receiving callsign as single string
BlackMisc::Aviation::CCallsignSet getReceivingCallsigns(quint16 transceiverID) const;
signals:
//! Changed callsigns