Changeset 4742 for pjproject

Timestamp:

Feb 12, 2014 5:18:31 AM (11 years ago)

Author:

bennylp

Message:

More pjsua2 API (re #1519): renamed TimeValue? to TimeVal? due to conflict in iOS SDK

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua2/call.hpp (modified) (3 diffs)
• include/pjsua2/types.hpp (modified) (1 diff)
• src/pjsua2/types.cpp (modified) (1 diff)

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

@@ -91 +91 @@
 struct RtcpStreamStat
 {
-    TimeValue       update;     /**< Time of last update.                   */
+    TimeVal         update;     /**< Time of last update.                   */
     unsigned        updateCount;/**< Number of updates (to calculate avg)   */
     unsigned        pkt;        /**< Total number of packets                */
@@ -141 +141 @@
 struct RtcpStat
 {
-    TimeValue           start;          /**< Time when session was created  */
+    TimeVal             start;          /**< Time when session was created  */
     
     RtcpStreamStat      txStat;         /**< Encoder stream statistics.     */
@@ -509 +509 @@
      * established)
      */
-    TimeValue           connectDuration;
+    TimeVal             connectDuration;
     
     /**
      * Total call duration, including set-up time
      */
-    TimeValue           totalDuration;
+    TimeVal             totalDuration;
     
     /**

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

@@ -237 +237 @@
  * Representation of time value.
  */
-struct TimeValue
+struct TimeVal
 {
     /**

pjproject/trunk/pjsip/src/pjsua2/types.cpp

@@ -88 +88 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-void TimeValue::fromPj(const pj_time_val &prm)
+void TimeVal::fromPj(const pj_time_val &prm)
 {
     this->sec  = prm.sec;