Changeset 4918 for pjproject/trunk/pjsip/include/pjsua2/call.hpp

Timestamp:

Sep 9, 2014 4:10:59 AM (10 years ago)

Author:

ming

Message:

Fixed #1784: Remove the usage of nested structs/unions in PJSUA2 (unsupported by SWIG C++)

File:

• pjproject/trunk/pjsip/include/pjsua2/call.hpp (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsua2/call.hpp

@@ -102 +102 @@
     MathStat        lossPeriodUsec; /**< Loss period statistics             */
 
-    struct {
-        unsigned    burst;      /**< Burst/sequential packet lost detected  */
-        unsigned    random;     /**< Random packet lost detected.           */
-    } lossType;                 /**< Types of loss detected.                */
+                                /**< Types of loss detected.                */
+    unsigned        burst;      /**< Burst/sequential packet lost detected  */
+    unsigned        random;     /**< Random packet lost detected.           */
     
     MathStat        jitterUsec; /**< Jitter statistics                      */
@@ -238 +237 @@
 
 /**
+ * Media event data.
+ */
+typedef union MediaEventData {
+    /**
+     * Media format changed event data.
+     */
+    MediaFmtChangedEvent    fmtChanged;
+    
+    /**
+     * Pointer to storage to user event data, if it's outside
+     * this struct
+     */
+    GenericData         ptr;
+
+} MediaEventData;
+
+/**
  * This structure describes a media event. It corresponds to the
  * pjmedia_event structure.
@@ -252 +268 @@
      * will be specific to the event type being reported.
      */
-    union {
-        /**
-         * Media format changed event data.
-         */
-        MediaFmtChangedEvent    fmtChanged;
-        
-        /**
-         * Pointer to storage to user event data, if it's outside
-         * this struct
-         */
-        GenericData             ptr;
-    } data;
+    MediaEventData              data;
     
     /**