This commit is contained in:
Klaus Basan
2019-10-18 12:10:46 +02:00
parent b88bdee405
commit aaa5fc259a
6 changed files with 22 additions and 1 deletions

View File

@@ -182,8 +182,10 @@ namespace BlackCore
//! Heartbeat DTO
struct HeartbeatDto
{
//! Name @{
static QByteArray getDtoName() { return "HeartbeatDto"; }
static QByteArray getShortDtoName() { return "H"; }
//! @}
std::string callsign; //!< callsign
MSGPACK_DEFINE(callsign)
@@ -192,8 +194,11 @@ namespace BlackCore
//! Heartbeat DTO
struct HeartbeatAckDto
{
//! Name @{
static QByteArray getDtoName() { return "HeartbeatAckDto"; }
static QByteArray getShortDtoName() { return "HA"; }
//! @}
MSGPACK_DEFINE()
};
@@ -206,6 +211,7 @@ namespace BlackCore
float distanceRatio;
// std::string RelayCallsign;
//! @}
MSGPACK_DEFINE(id, frequency, distanceRatio/*, RelayCallsign*/)
};

View File

@@ -25,7 +25,10 @@ namespace BlackCore
class BLACKCORE_EXPORT CAfvMapReader : public QObject
{
Q_OBJECT
//! Map reader properties @{
Q_PROPERTY(CSampleAtcStationModel *atcStationModel READ getAtcStationModel CONSTANT)
//! @}
public:
//! Ctor

View File

@@ -192,7 +192,6 @@ namespace BlackCore
//! .unmute unmute BlackCore::Context::CContextAudio
//! .vol .volume volume 0..100 set volume BlackCore::Context::CContextAudio
//! </pre>
//! \copydoc IContext::parseCommandLine
virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override;
// ------------- DBus ---------------

View File

@@ -365,7 +365,10 @@ namespace BlackCore
//! Connect to receive raw fsd messages
virtual QMetaObject::Connection connectRawFsdMessageSignal(QObject *receiver, RawFsdMessageReceivedSlot rawFsdMessageReceivedSlot) = 0;
//! Cmd.line arguments
static const QList<QCommandLineOption> &getCmdLineOptions();
//! Client id and key from cmd.line
static bool getCmdLineClientIdAndKey(int &id, QString &key);
protected:

View File

@@ -30,9 +30,12 @@ namespace BlackGui
class BLACKGUI_EXPORT CLevelMeter : public QFrame
{
Q_OBJECT
//! Properties @{
Q_PROPERTY(QColor lowColor READ getLowColor WRITE setLowColor)
Q_PROPERTY(QColor highColor READ getHighColor WRITE setHighColor)
Q_PROPERTY(QColor peakColor READ getPeakColor WRITE setPeakColor)
//! @}
public:
//! Constructor

View File

@@ -31,6 +31,12 @@ namespace BlackSound
//! Dtor
~COpusEncoder();
//! Non copyable
COpusEncoder(const COpusEncoder &temp_obj) = delete;
//! Non assignable
COpusEncoder &operator=(const COpusEncoder &temp_obj) = delete;
//! Bit rate
void setBitRate(int bitRate);
@@ -41,6 +47,7 @@ namespace BlackSound
//! Frame count
int frameCount(const QVector<qint16> pcmSamples);
//! Encode
QByteArray encode(const QVector<qint16> pcmSamples, int samplesLength, int *encodedLength);
private: