engage-engine 1.252.90920030 → 1.255.90950032

package/include/ConfigurationObjects.h

@@ -12,7 +12,7 @@
  *
  * This file contains all the configuration objects
  *
- *  Copyright (c) 2018 Rally Tactical Systems, Inc.
+ *  Copyright (c) 2019 Rally Tactical Systems, Inc.
  *  All rights reserved.
  *
  */
@@ -3437,7 +3437,11 @@ namespace AppConfigurationObjects
             ctMelpe1200     = 51,
 
             /** @brief MELPe 2.4 (kbit/s) <a href="https://en.wikipedia.org/wiki/Mixed-excitation_linear_prediction" target="_blank">See for more info</a> */
-            ctMelpe2400     = 52
+            ctMelpe2400     = 52,
+
+            /* CVSD */
+            /** @brief CVSD (Continuous Variable Slope Delta Modulation) <a href="https://en.wikipedia.org/wiki/Continuous_variable_slope_delta_modulation" target="_blank">See for more info</a> */
+            ctCvsd          = 60
         } TxCodec_t;
 
         /** @brief [Optional, Default: true] Audio transmission is enabled */
@@ -5031,6 +5035,62 @@ namespace AppConfigurationObjects
         FROMJSON_IMPL_SIMPLE(mixedStreamTxParams);
     }    
 
+    //-----------------------------------------------------------
+    JSON_SERIALIZED_CLASS(GroupDefaultAudioPriority)
+    /**
+     * @brief Options for Source
+     *
+     *  Helper C++ class to serialize and de-serialize GroupDefaultAudioPriority JSON
+     *
+     *  TODO: Complete this Class
+     *
+     *  Example: @include[doc] examples/GroupDefaultAudioPriority.json
+     *
+     *  @see Group
+     */
+    class GroupDefaultAudioPriority : public ConfigurationObjectBase
+    {
+        IMPLEMENT_JSON_SERIALIZATION()
+        IMPLEMENT_JSON_DOCUMENTATION(GroupDefaultAudioPriority)
+
+    public:
+        /** @brief [Optional] The default audio priority */
+        uint8_t        tx;
+
+        /** @brief [Optional] The default audio RX priority */
+        uint8_t        rx;
+
+        GroupDefaultAudioPriority()
+        {
+            clear();
+        }
+
+        void clear()
+        {
+            tx = 0;
+            rx = 0;
+        }
+
+        virtual void initForDocumenting()
+        {
+            clear();
+        }
+    };
+
+    static void to_json(nlohmann::json& j, const GroupDefaultAudioPriority& p)
+    {
+        j = nlohmann::json{
+            TOJSON_IMPL(tx),
+            TOJSON_IMPL(rx)
+        };
+    }
+    static void from_json(const nlohmann::json& j, GroupDefaultAudioPriority& p)
+    {
+        p.clear();
+        FROMJSON_IMPL_SIMPLE(tx);
+        FROMJSON_IMPL_SIMPLE(rx);
+    }  
+
     //-----------------------------------------------------------
     JSON_SERIALIZED_CLASS(Group)
     /**
@@ -5081,6 +5141,9 @@ namespace AppConfigurationObjects
         /** @brief Output details for when the group is a target in a bridge (see @ref GroupBridgeTargetOutputDetail). */
         GroupBridgeTargetOutputDetail          bridgeTargetOutputDetail;
 
+        /** @brief Default audio priority for the group (see @ref GroupDefaultAudioPriority). */
+        GroupDefaultAudioPriority               defaultAudioPriority;
+
         /**
          * @brief Unique identity for the group.
          *
@@ -5246,6 +5309,7 @@ namespace AppConfigurationObjects
         {
             type = gtUnknown;
             bridgeTargetOutputDetail.clear();
+            defaultAudioPriority.clear();
             id.clear();
             name.clear();
             spokenName.clear();
@@ -5323,6 +5387,7 @@ namespace AppConfigurationObjects
         j = nlohmann::json{
             TOJSON_IMPL(type),
             TOJSON_IMPL(bridgeTargetOutputDetail),
+            TOJSON_IMPL(defaultAudioPriority),
             TOJSON_IMPL(id),
             TOJSON_IMPL(name),
             TOJSON_IMPL(spokenName),
@@ -5441,6 +5506,7 @@ namespace AppConfigurationObjects
         getOptional<int>("rfc4733RtpPayloadId", p.rfc4733RtpPayloadId, j, 0);
         getOptional<std::vector<RtpPayloadTypeTranslation>>("inboundRtpPayloadTypeTranslations", p.inboundRtpPayloadTypeTranslations, j);
         getOptional<GroupPriorityTranslation>("priorityTranslation", p.priorityTranslation, j);
+        getOptional<GroupDefaultAudioPriority>("defaultAudioPriority", p.defaultAudioPriority, j);
         getOptional<int>("stickyTidHangSecs", p.stickyTidHangSecs, j, 10);
         getOptional<std::string>("anonymousAlias", p.anonymousAlias, j);
         getOptional<bool>("lbCrypto", p.lbCrypto, j, false);
@@ -5629,6 +5695,9 @@ namespace AppConfigurationObjects
         /** @brief [Read only] Manufacturer ID. */
         std::string                             manufacturerId;
 
+        /** @brief The HMAC to be used for activation purposes. */
+        std::string                             activationHmac;
+
         LicenseDescriptor()
         {
             clear();
@@ -5648,6 +5717,7 @@ namespace AppConfigurationObjects
             deviceId.clear();
             status = ERR_NOT_INITIALIZED;
             manufacturerId.clear();
+            activationHmac.clear();
         }
     };
 
@@ -5667,7 +5737,8 @@ namespace AppConfigurationObjects
             //TOJSON_IMPL(manufacturerId),
             {"manufacturerId", "*manufacturerId*"},
             TOJSON_IMPL(cargo),
-            TOJSON_IMPL(cargoFlags)
+            TOJSON_IMPL(cargoFlags),
+            TOJSON_IMPL(activationHmac)
         };
     }
 
@@ -5686,6 +5757,7 @@ namespace AppConfigurationObjects
         FROMJSON_IMPL(manufacturerId, std::string, EMPTY_STRING);
         FROMJSON_IMPL(cargo, std::string, EMPTY_STRING);
         FROMJSON_IMPL(cargoFlags, uint8_t, 0);
+        FROMJSON_IMPL(activationHmac, std::string, EMPTY_STRING);
     }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "engage-engine",
-  "version": "1.252.90920030",
+  "version": "1.255.90950032",
   "description": "Use Engage to communicate with everyone, everywhere, from any device",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"