diff options
| author | Benny Prijono <bennylp@teluu.com> | 2014-02-12 05:18:31 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2014-02-12 05:18:31 +0000 |
| commit | e72b82609c1822ca2574286160e0385073f4ab93 (patch) | |
| tree | 9a1a927a2fc594901eb098c32aca2cec276c9d61 | |
| parent | 507bdb737142e1fb7488936efb0ebfc258f1da61 (diff) | |
More pjsua2 API (re #1519): renamed TimeValue to TimeVal due to conflict in iOS SDK
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4742 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjsip/include/pjsua2/call.hpp | 8 | ||||
| -rw-r--r-- | pjsip/include/pjsua2/types.hpp | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsua2/types.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pjsip/include/pjsua2/call.hpp b/pjsip/include/pjsua2/call.hpp index c4978e38..52dcd29e 100644 --- a/pjsip/include/pjsua2/call.hpp +++ b/pjsip/include/pjsua2/call.hpp @@ -90,7 +90,7 @@ public: */ 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 */ unsigned bytes; /**< Total number of payload/bytes */ @@ -140,7 +140,7 @@ public: */ struct RtcpStat { - TimeValue start; /**< Time when session was created */ + TimeVal start; /**< Time when session was created */ RtcpStreamStat txStat; /**< Encoder stream statistics. */ RtcpStreamStat rxStat; /**< Decoder stream statistics. */ @@ -508,12 +508,12 @@ struct CallInfo * Up-to-date call connected duration (zero when call is not * established) */ - TimeValue connectDuration; + TimeVal connectDuration; /** * Total call duration, including set-up time */ - TimeValue totalDuration; + TimeVal totalDuration; /** * Flag if remote was SDP offerer diff --git a/pjsip/include/pjsua2/types.hpp b/pjsip/include/pjsua2/types.hpp index 129ac4a6..4e1bb8c3 100644 --- a/pjsip/include/pjsua2/types.hpp +++ b/pjsip/include/pjsua2/types.hpp @@ -236,7 +236,7 @@ struct Version /** * Representation of time value. */ -struct TimeValue +struct TimeVal { /** * The seconds part of the time. diff --git a/pjsip/src/pjsua2/types.cpp b/pjsip/src/pjsua2/types.cpp index 26740cc7..b62fab5a 100644 --- a/pjsip/src/pjsua2/types.cpp +++ b/pjsip/src/pjsua2/types.cpp @@ -87,7 +87,7 @@ string Error::info(bool multi_line) const /////////////////////////////////////////////////////////////////////////////// -void TimeValue::fromPj(const pj_time_val &prm) +void TimeVal::fromPj(const pj_time_val &prm) { this->sec = prm.sec; this->msec = prm.msec; |