From 7513bccf527ecbb3df06ea32fb124d19c855f523 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Sat, 13 Jan 2024 19:22:24 -0500 Subject: [PATCH] refactor PROPERTY_PLAIN and READONLY_PROPERTY_PLAIN; --- src/common/Defines.h | 22 ++++++++-------- src/common/Thread.h | 2 +- src/common/dmr/SiteData.h | 12 ++++----- src/common/dmr/data/EmbeddedData.h | 2 +- src/common/dmr/lc/CSBK.h | 2 +- src/common/lookups/AffiliationLookup.h | 10 +++---- src/common/lookups/IdenTableLookup.h | 10 +++---- src/common/lookups/RadioIdLookup.h | 4 +-- src/common/lookups/TalkgroupRulesLookup.h | 32 +++++++++++------------ src/common/network/BaseNetwork.h | 4 +-- src/common/nxdn/SiteData.h | 16 ++++++------ src/common/nxdn/lc/RCCH.h | 2 +- src/common/p25/SiteData.h | 26 +++++++++--------- src/common/p25/dfsi/LC.h | 4 +-- src/common/p25/lc/TDULC.h | 2 +- src/common/p25/lc/TSBK.h | 2 +- src/cpp.hint | 13 --------- src/fne/network/FNENetwork.h | 28 ++++++++++---------- src/host/dmr/packet/Voice.cpp | 4 +-- src/host/network/Network.h | 2 +- 20 files changed, 93 insertions(+), 106 deletions(-) delete mode 100644 src/cpp.hint diff --git a/src/common/Defines.h b/src/common/Defines.h index 69fdf85d..bc7d9a76 100644 --- a/src/common/Defines.h +++ b/src/common/Defines.h @@ -209,14 +209,14 @@ const uint8_t IP_COMPRESS_RFC1144_UNCOMPRESS = 0x02U; protected: type m_##variableName; \ public: __forceinline type get##propName(void) const { return m_##variableName; } -/// Creates a read-only get property, does not use "get"/"set". -#define __PROTECTED_READONLY_PROPERTY_PLAIN(type, variableName, propName) \ +/// Creates a read-only get property, does not use "get". +#define __PROTECTED_READONLY_PROPERTY_PLAIN(type, variableName) \ protected: type m_##variableName; \ - public: __forceinline type propName(void) const { return m_##variableName; } + public: __forceinline type variableName(void) const { return m_##variableName; } /// Creates a read-only get property, does not use "get". -#define __READONLY_PROPERTY_PLAIN(type, variableName, propName) \ +#define __READONLY_PROPERTY_PLAIN(type, variableName) \ private: type m_##variableName; \ - public: __forceinline type propName(void) const { return m_##variableName; } + public: __forceinline type variableName(void) const { return m_##variableName; } /// Creates a get and set private property. #define __PROPERTY(type, variableName, propName) \ @@ -230,14 +230,14 @@ const uint8_t IP_COMPRESS_RFC1144_UNCOMPRESS = 0x02U; __forceinline void set##propName(type val) { m_##variableName = val; } /// Creates a get and set private property, does not use "get"/"set". -#define __PROPERTY_PLAIN(type, variableName, propName) \ +#define __PROPERTY_PLAIN(type, variableName) \ private: type m_##variableName; \ - public: __forceinline type propName(void) const { return m_##variableName; } \ - __forceinline void propName(type val) { m_##variableName = val; } + public: __forceinline type variableName(void) const { return m_##variableName; }\ + __forceinline void variableName(type val) { m_##variableName = val; } /// Creates a get and set protected property, does not use "get"/"set". -#define __PROTECTED_PROPERTY_PLAIN(type, variableName, propName) \ +#define __PROTECTED_PROPERTY_PLAIN(type, variableName) \ protected: type m_##variableName; \ - public: __forceinline type propName(void) const { return m_##variableName; } \ - __forceinline void propName(type val) { m_##variableName = val; } + public: __forceinline type variableName(void) const { return m_##variableName; }\ + __forceinline void variableName(type val) { m_##variableName = val; } #endif // __COMMON_DEFINES_H__ diff --git a/src/common/Thread.h b/src/common/Thread.h index 37ca6c8e..08070948 100644 --- a/src/common/Thread.h +++ b/src/common/Thread.h @@ -71,7 +71,7 @@ private: public: /// Flag indicating if the thread was started. - __PROTECTED_READONLY_PROPERTY_PLAIN(bool, started, started); + __PROTECTED_READONLY_PROPERTY_PLAIN(bool, started); }; #endif // __THREAD_H__ diff --git a/src/common/dmr/SiteData.h b/src/common/dmr/SiteData.h index d6e5c447..1da350f0 100644 --- a/src/common/dmr/SiteData.h +++ b/src/common/dmr/SiteData.h @@ -155,17 +155,17 @@ namespace dmr public: /// DMR site model type. - __READONLY_PROPERTY_PLAIN(uint8_t, siteModel, siteModel); + __READONLY_PROPERTY_PLAIN(uint8_t, siteModel); /// DMR site network ID. - __READONLY_PROPERTY_PLAIN(uint16_t, netId, netId); + __READONLY_PROPERTY_PLAIN(uint16_t, netId); /// DMR site ID. - __READONLY_PROPERTY_PLAIN(uint16_t, siteId, siteId); + __READONLY_PROPERTY_PLAIN(uint16_t, siteId); /// DMR partition ID. - __READONLY_PROPERTY_PLAIN(uint8_t, parId, parId); + __READONLY_PROPERTY_PLAIN(uint8_t, parId); /// DMR require registration. - __READONLY_PROPERTY_PLAIN(bool, requireReg, requireReg); + __READONLY_PROPERTY_PLAIN(bool, requireReg); /// Flag indicating whether this site is a linked active network member. - __READONLY_PROPERTY_PLAIN(bool, netActive, netActive); + __READONLY_PROPERTY_PLAIN(bool, netActive); }; } // namespace dmr diff --git a/src/common/dmr/data/EmbeddedData.h b/src/common/dmr/data/EmbeddedData.h index d192e9af..fac92c83 100644 --- a/src/common/dmr/data/EmbeddedData.h +++ b/src/common/dmr/data/EmbeddedData.h @@ -78,7 +78,7 @@ namespace dmr public: /// Flag indicating whether or not the embedded data is valid. - __READONLY_PROPERTY_PLAIN(bool, valid, isValid); + __READONLY_PROPERTY_PLAIN(bool, valid); /// Full-link control opcode. __READONLY_PROPERTY(uint8_t, FLCO, FLCO); diff --git a/src/common/dmr/lc/CSBK.h b/src/common/dmr/lc/CSBK.h index a3c05801..47d9550c 100644 --- a/src/common/dmr/lc/CSBK.h +++ b/src/common/dmr/lc/CSBK.h @@ -141,7 +141,7 @@ namespace dmr /** Local Site data */ /// Local Site Identity Entry. - __PROTECTED_PROPERTY_PLAIN(::lookups::IdenTable, siteIdenEntry, siteIdenEntry); + __PROTECTED_PROPERTY_PLAIN(::lookups::IdenTable, siteIdenEntry); protected: static bool m_verbose; diff --git a/src/common/lookups/AffiliationLookup.h b/src/common/lookups/AffiliationLookup.h index b240c5d2..2966bf4f 100644 --- a/src/common/lookups/AffiliationLookup.h +++ b/src/common/lookups/AffiliationLookup.h @@ -93,15 +93,15 @@ namespace lookups public: /// Voice Channel Identity. - __READONLY_PROPERTY_PLAIN(uint8_t, chId, chId); + __READONLY_PROPERTY_PLAIN(uint8_t, chId); /// Voice Channel Number. - __READONLY_PROPERTY_PLAIN(uint32_t, chNo, chNo); + __READONLY_PROPERTY_PLAIN(uint32_t, chNo); /// REST API Address. - __READONLY_PROPERTY_PLAIN(std::string, address, address); + __READONLY_PROPERTY_PLAIN(std::string, address); /// REST API Port. - __READONLY_PROPERTY_PLAIN(uint16_t, port, port); + __READONLY_PROPERTY_PLAIN(uint16_t, port); /// REST API Password. - __READONLY_PROPERTY_PLAIN(std::string, password, password); + __READONLY_PROPERTY_PLAIN(std::string, password); }; // --------------------------------------------------------------------------- diff --git a/src/common/lookups/IdenTableLookup.h b/src/common/lookups/IdenTableLookup.h index 13280fae..28473d76 100644 --- a/src/common/lookups/IdenTableLookup.h +++ b/src/common/lookups/IdenTableLookup.h @@ -86,15 +86,15 @@ namespace lookups public: /// Channel ID for this entry. - __READONLY_PROPERTY_PLAIN(uint8_t, channelId, channelId); + __READONLY_PROPERTY_PLAIN(uint8_t, channelId); /// Base frequency for this entry. - __READONLY_PROPERTY_PLAIN(uint32_t, baseFrequency, baseFrequency); + __READONLY_PROPERTY_PLAIN(uint32_t, baseFrequency); /// Channel spacing in kHz for this entry. - __READONLY_PROPERTY_PLAIN(float, chSpaceKhz, chSpaceKhz); + __READONLY_PROPERTY_PLAIN(float, chSpaceKhz); /// Channel transmit offset in MHz for this entry. - __READONLY_PROPERTY_PLAIN(float, txOffsetMhz, txOffsetMhz); + __READONLY_PROPERTY_PLAIN(float, txOffsetMhz); /// Channel bandwith in kHz for this entry. - __READONLY_PROPERTY_PLAIN(float, chBandwidthKhz, chBandwidthKhz); + __READONLY_PROPERTY_PLAIN(float, chBandwidthKhz); }; // --------------------------------------------------------------------------- diff --git a/src/common/lookups/RadioIdLookup.h b/src/common/lookups/RadioIdLookup.h index 131d22f6..e48d0fae 100644 --- a/src/common/lookups/RadioIdLookup.h +++ b/src/common/lookups/RadioIdLookup.h @@ -85,9 +85,9 @@ namespace lookups public: /// Flag indicating if the radio is enabled. - __READONLY_PROPERTY_PLAIN(bool, radioEnabled, radioEnabled); + __READONLY_PROPERTY_PLAIN(bool, radioEnabled); /// Flag indicating if the radio is default. - __READONLY_PROPERTY_PLAIN(bool, radioDefault, radioDefault); + __READONLY_PROPERTY_PLAIN(bool, radioDefault); }; // --------------------------------------------------------------------------- diff --git a/src/common/lookups/TalkgroupRulesLookup.h b/src/common/lookups/TalkgroupRulesLookup.h index ed9fc72d..19530ade 100644 --- a/src/common/lookups/TalkgroupRulesLookup.h +++ b/src/common/lookups/TalkgroupRulesLookup.h @@ -73,9 +73,9 @@ namespace lookups public: /// Talkgroup ID. - __PROPERTY_PLAIN(uint32_t, tgId, tgId); + __PROPERTY_PLAIN(uint32_t, tgId); /// Talkgroup DMR slot. - __PROPERTY_PLAIN(uint8_t, tgSlot, tgSlot); + __PROPERTY_PLAIN(uint8_t, tgSlot); }; // --------------------------------------------------------------------------- @@ -117,11 +117,11 @@ namespace lookups public: /// Peer ID. - __PROPERTY_PLAIN(uint32_t, peerId, peerId); + __PROPERTY_PLAIN(uint32_t, peerId); /// Talkgroup ID. - __PROPERTY_PLAIN(uint32_t, tgId, tgId); + __PROPERTY_PLAIN(uint32_t, tgId); /// Talkgroup DMR slot. - __PROPERTY_PLAIN(uint8_t, tgSlot, tgSlot); + __PROPERTY_PLAIN(uint8_t, tgSlot); }; // --------------------------------------------------------------------------- @@ -189,15 +189,15 @@ namespace lookups public: /// Flag indicating whether the rule is active. - __PROPERTY_PLAIN(bool, active, active); + __PROPERTY_PLAIN(bool, active); /// Flag indicating whether or not the talkgroup is a parrot. - __PROPERTY_PLAIN(bool, parrot, parrot); + __PROPERTY_PLAIN(bool, parrot); /// List of peer IDs included by this rule. - __PROPERTY_PLAIN(std::vector, inclusion, inclusion); + __PROPERTY_PLAIN(std::vector, inclusion); /// List of peer IDs excluded by this rule. - __PROPERTY_PLAIN(std::vector, exclusion, exclusion); + __PROPERTY_PLAIN(std::vector, exclusion); /// List of rewrites performed by this rule. - __PROPERTY_PLAIN(std::vector, rewrite, rewrite); + __PROPERTY_PLAIN(std::vector, rewrite); }; // --------------------------------------------------------------------------- @@ -247,11 +247,11 @@ namespace lookups public: /// Textual name for the routing rule. - __PROPERTY_PLAIN(std::string, name, name); + __PROPERTY_PLAIN(std::string, name); /// Configuration for the routing rule. - __PROPERTY_PLAIN(TalkgroupRuleConfig, config, config); + __PROPERTY_PLAIN(TalkgroupRuleConfig, config); /// Source talkgroup information for the routing rule. - __PROPERTY_PLAIN(TalkgroupRuleGroupVoiceSource, source, source); + __PROPERTY_PLAIN(TalkgroupRuleGroupVoiceSource, source); }; // --------------------------------------------------------------------------- @@ -308,11 +308,11 @@ namespace lookups public: /// Number indicating the number of seconds to hang on a talkgroup. - __PROPERTY_PLAIN(uint32_t, groupHangTime, groupHangTime); + __PROPERTY_PLAIN(uint32_t, groupHangTime); /// Flag indicating whether or not the network layer should send the talkgroups to peers. - __PROPERTY_PLAIN(bool, sendTalkgroups, sendTalkgroups); + __PROPERTY_PLAIN(bool, sendTalkgroups); /// List of group voice rules. - __PROPERTY_PLAIN(std::vector, groupVoice, groupVoice); + __PROPERTY_PLAIN(std::vector, groupVoice); }; } // namespace lookups diff --git a/src/common/network/BaseNetwork.h b/src/common/network/BaseNetwork.h index a8d616bf..75320698 100644 --- a/src/common/network/BaseNetwork.h +++ b/src/common/network/BaseNetwork.h @@ -231,9 +231,9 @@ namespace network __PROTECTED_READONLY_PROPERTY(NET_CONN_STATUS, status, Status); /// Unix socket storage containing the connected address. - __PROTECTED_READONLY_PROPERTY_PLAIN(sockaddr_storage, addr, addr); + __PROTECTED_READONLY_PROPERTY_PLAIN(sockaddr_storage, addr); /// Length of the sockaddr_storage structure. - __PROTECTED_READONLY_PROPERTY_PLAIN(uint32_t, addrLen, addrLen); + __PROTECTED_READONLY_PROPERTY_PLAIN(uint32_t, addrLen); /// Flag indicating whether network DMR slot 1 traffic is permitted. __PROTECTED_READONLY_PROPERTY(bool, slot1, DMRSlot1); diff --git a/src/common/nxdn/SiteData.h b/src/common/nxdn/SiteData.h index 39df3577..333ca5d7 100644 --- a/src/common/nxdn/SiteData.h +++ b/src/common/nxdn/SiteData.h @@ -165,21 +165,21 @@ namespace nxdn public: /// NXDN location ID. - __READONLY_PROPERTY_PLAIN(uint32_t, locId, locId); + __READONLY_PROPERTY_PLAIN(uint32_t, locId); /// Channel ID. - __READONLY_PROPERTY_PLAIN(uint8_t, channelId, channelId); + __READONLY_PROPERTY_PLAIN(uint8_t, channelId); /// Channel number. - __READONLY_PROPERTY_PLAIN(uint32_t, channelNo, channelNo); + __READONLY_PROPERTY_PLAIN(uint32_t, channelNo); /// Service class. - __READONLY_PROPERTY_PLAIN(uint8_t, serviceClass, serviceClass); + __READONLY_PROPERTY_PLAIN(uint8_t, serviceClass); /// Flag indicating whether this site data is for an adjacent site. - __READONLY_PROPERTY_PLAIN(bool, isAdjSite, isAdjSite); + __READONLY_PROPERTY_PLAIN(bool, isAdjSite); /// Callsign. - __READONLY_PROPERTY_PLAIN(std::string, callsign, callsign); + __READONLY_PROPERTY_PLAIN(std::string, callsign); /// NXDN require registration. - __READONLY_PROPERTY_PLAIN(bool, requireReg, requireReg); + __READONLY_PROPERTY_PLAIN(bool, requireReg); /// Flag indicating whether this site is a linked active network member. - __READONLY_PROPERTY_PLAIN(bool, netActive, netActive); + __READONLY_PROPERTY_PLAIN(bool, netActive); }; } // namespace nxdn diff --git a/src/common/nxdn/lc/RCCH.h b/src/common/nxdn/lc/RCCH.h index b09676ef..1382b5e7 100644 --- a/src/common/nxdn/lc/RCCH.h +++ b/src/common/nxdn/lc/RCCH.h @@ -119,7 +119,7 @@ namespace nxdn /** Local Site data */ /// Local Site Identity Entry. - __PROTECTED_PROPERTY_PLAIN(lookups::IdenTable, siteIdenEntry, siteIdenEntry); + __PROTECTED_PROPERTY_PLAIN(lookups::IdenTable, siteIdenEntry); protected: static bool m_verbose; diff --git a/src/common/p25/SiteData.h b/src/common/p25/SiteData.h index a9c3f495..869c2292 100644 --- a/src/common/p25/SiteData.h +++ b/src/common/p25/SiteData.h @@ -253,31 +253,31 @@ namespace p25 public: /// P25 location resource area. - __READONLY_PROPERTY_PLAIN(uint8_t, lra, lra); + __READONLY_PROPERTY_PLAIN(uint8_t, lra); /// P25 network ID. - __READONLY_PROPERTY_PLAIN(uint32_t, netId, netId); + __READONLY_PROPERTY_PLAIN(uint32_t, netId); /// Gets the P25 system ID. - __READONLY_PROPERTY_PLAIN(uint32_t, sysId, sysId); + __READONLY_PROPERTY_PLAIN(uint32_t, sysId); /// P25 RFSS ID. - __READONLY_PROPERTY_PLAIN(uint8_t, rfssId, rfssId); + __READONLY_PROPERTY_PLAIN(uint8_t, rfssId); /// P25 site ID. - __READONLY_PROPERTY_PLAIN(uint8_t, siteId, siteId); + __READONLY_PROPERTY_PLAIN(uint8_t, siteId); /// Channel ID. - __READONLY_PROPERTY_PLAIN(uint8_t, channelId, channelId); + __READONLY_PROPERTY_PLAIN(uint8_t, channelId); /// Channel number. - __READONLY_PROPERTY_PLAIN(uint32_t, channelNo, channelNo); + __READONLY_PROPERTY_PLAIN(uint32_t, channelNo); /// Service class. - __READONLY_PROPERTY_PLAIN(uint8_t, serviceClass, serviceClass); + __READONLY_PROPERTY_PLAIN(uint8_t, serviceClass); /// Flag indicating whether this site data is for an adjacent site. - __READONLY_PROPERTY_PLAIN(bool, isAdjSite, isAdjSite); + __READONLY_PROPERTY_PLAIN(bool, isAdjSite); /// Callsign. - __READONLY_PROPERTY_PLAIN(std::string, callsign, callsign); + __READONLY_PROPERTY_PLAIN(std::string, callsign); /// Count of available channels. - __READONLY_PROPERTY_PLAIN(uint8_t, chCnt, chCnt); + __READONLY_PROPERTY_PLAIN(uint8_t, chCnt); /// Flag indicating whether this site is a linked active network member. - __READONLY_PROPERTY_PLAIN(bool, netActive, netActive); + __READONLY_PROPERTY_PLAIN(bool, netActive); /// Local Time Offset. - __READONLY_PROPERTY_PLAIN(int8_t, lto, lto); + __READONLY_PROPERTY_PLAIN(int8_t, lto); }; } // namespace p25 diff --git a/src/common/p25/dfsi/LC.h b/src/common/p25/dfsi/LC.h index a346ab93..20f48b51 100644 --- a/src/common/p25/dfsi/LC.h +++ b/src/common/p25/dfsi/LC.h @@ -78,9 +78,9 @@ namespace p25 __PROPERTY(uint8_t, rssi, RSSI); /// Link control data. - __READONLY_PROPERTY_PLAIN(p25::lc::LC*, control, control); + __READONLY_PROPERTY_PLAIN(p25::lc::LC*, control); /// Low speed data. - __READONLY_PROPERTY_PLAIN(p25::data::LowSpeedData*, lsd, lsd); + __READONLY_PROPERTY_PLAIN(p25::data::LowSpeedData*, lsd); private: edac::RS634717 m_rs; diff --git a/src/common/p25/lc/TDULC.h b/src/common/p25/lc/TDULC.h index b852b00c..872ee0d2 100644 --- a/src/common/p25/lc/TDULC.h +++ b/src/common/p25/lc/TDULC.h @@ -107,7 +107,7 @@ namespace p25 /** Local Site data */ /// Local Site Identity Entry. - __PROTECTED_PROPERTY_PLAIN(::lookups::IdenTable, siteIdenEntry, siteIdenEntry); + __PROTECTED_PROPERTY_PLAIN(::lookups::IdenTable, siteIdenEntry); protected: friend class LC; diff --git a/src/common/p25/lc/TSBK.h b/src/common/p25/lc/TSBK.h index cb1ce7a8..92d26dd4 100644 --- a/src/common/p25/lc/TSBK.h +++ b/src/common/p25/lc/TSBK.h @@ -145,7 +145,7 @@ namespace p25 /** Local Site data */ /// Local Site Identity Entry. - __PROTECTED_PROPERTY_PLAIN(::lookups::IdenTable, siteIdenEntry, siteIdenEntry); + __PROTECTED_PROPERTY_PLAIN(::lookups::IdenTable, siteIdenEntry); protected: friend class dfsi::LC; diff --git a/src/cpp.hint b/src/cpp.hint deleted file mode 100644 index 7dbe0605..00000000 --- a/src/cpp.hint +++ /dev/null @@ -1,13 +0,0 @@ -// Creates a read-only get property. -#define __READONLY_PROPERTY(type, variableName, propName) -// Creates a read-only get property, does not use "get". -#define __READONLY_PROPERTY_PLAIN(type, variableName, propName) -// Creates a read-only get property by reference. -#define __READONLY_PROPERTY_BYREF(type, variableName, propName) - -// Creates a get and set property. -#define __PROPERTY(type, variableName, propName) -// Creates a get and set property, does not use "get"/"set". -#define __PROPERTY_PLAIN(type, variableName, propName) -// Creates a get and set property by reference. -#define __PROPERTY_BYREF(type, variableName, propName) diff --git a/src/fne/network/FNENetwork.h b/src/fne/network/FNENetwork.h index 1ab900d9..03970ec1 100644 --- a/src/fne/network/FNENetwork.h +++ b/src/fne/network/FNENetwork.h @@ -134,41 +134,41 @@ namespace network public: /// Peer ID. - __PROPERTY_PLAIN(uint32_t, id, id); + __PROPERTY_PLAIN(uint32_t, id); /// Current Stream ID. - __PROPERTY_PLAIN(uint32_t, currStreamId, currStreamId); + __PROPERTY_PLAIN(uint32_t, currStreamId); /// Unix socket storage containing the connected address. - __PROPERTY_PLAIN(sockaddr_storage, socketStorage, socketStorage); + __PROPERTY_PLAIN(sockaddr_storage, socketStorage); /// Length of the sockaddr_storage structure. - __PROPERTY_PLAIN(uint32_t, sockStorageLen, sockStorageLen); + __PROPERTY_PLAIN(uint32_t, sockStorageLen); /// IP address peer connected with. - __PROPERTY_PLAIN(std::string, address, address); + __PROPERTY_PLAIN(std::string, address); /// Port number peer connected with. - __PROPERTY_PLAIN(uint16_t, port, port); + __PROPERTY_PLAIN(uint16_t, port); /// Salt value used for peer authentication. - __PROPERTY_PLAIN(uint32_t, salt, salt); + __PROPERTY_PLAIN(uint32_t, salt); /// Flag indicating whether or not the peer is connected. - __PROPERTY_PLAIN(bool, connected, connected); + __PROPERTY_PLAIN(bool, connected); /// Connection state. - __PROPERTY_PLAIN(NET_CONN_STATUS, connectionState, connectionState); + __PROPERTY_PLAIN(NET_CONN_STATUS, connectionState); /// Number of pings received. - __PROPERTY_PLAIN(uint32_t, pingsReceived, pingsReceived); + __PROPERTY_PLAIN(uint32_t, pingsReceived); /// Last ping received. - __PROPERTY_PLAIN(uint64_t, lastPing, lastPing); + __PROPERTY_PLAIN(uint64_t, lastPing); /// JSON objecting containing peer configuration information. - __PROPERTY_PLAIN(json::object, config, config); + __PROPERTY_PLAIN(json::object, config); /// Last received RTP sequence. - __PROPERTY_PLAIN(uint16_t, pktLastSeq, pktLastSeq); + __PROPERTY_PLAIN(uint16_t, pktLastSeq); /// Calculated next RTP sequence. - __PROPERTY_PLAIN(uint16_t, pktNextSeq, pktNextSeq); + __PROPERTY_PLAIN(uint16_t, pktNextSeq); }; // --------------------------------------------------------------------------- diff --git a/src/host/dmr/packet/Voice.cpp b/src/host/dmr/packet/Voice.cpp index 258202e7..74b6c202 100644 --- a/src/host/dmr/packet/Voice.cpp +++ b/src/host/dmr/packet/Voice.cpp @@ -467,7 +467,7 @@ bool Voice::process(uint8_t* data, uint32_t len) } // Regenerate the previous super blocks Embedded Data or substitude the LC for it - if (m_rfEmbeddedData[m_rfEmbeddedReadN].isValid()) + if (m_rfEmbeddedData[m_rfEmbeddedReadN].valid()) lcss = m_rfEmbeddedData[m_rfEmbeddedReadN].getData(data + 2U, m_rfN); else lcss = m_rfEmbeddedLC.getData(data + 2U, m_rfN); @@ -1077,7 +1077,7 @@ void Voice::processNetwork(const data::Data& dmrData) } else { // Regenerate the previous super blocks Embedded Data or substitude the LC for it - if (m_netEmbeddedData[m_netEmbeddedReadN].isValid()) + if (m_netEmbeddedData[m_netEmbeddedReadN].valid()) lcss = m_netEmbeddedData[m_netEmbeddedReadN].getData(data + 2U, dmrData.getN()); else lcss = m_netEmbeddedLC.getData(data + 2U, dmrData.getN()); diff --git a/src/host/network/Network.h b/src/host/network/Network.h index a53a64d7..40144781 100644 --- a/src/host/network/Network.h +++ b/src/host/network/Network.h @@ -83,7 +83,7 @@ namespace network public: /// Last received RTP sequence number. - __READONLY_PROPERTY_PLAIN(uint16_t, pktLastSeq, pktLastSeq); + __READONLY_PROPERTY_PLAIN(uint16_t, pktLastSeq); protected: std::string m_address;