Changeset 4658

Timestamp:

Nov 27, 2013 10:18:18 AM (11 years ago)

Author:

nanang

Message:

Re #1519: Minor fix on TransportInfo?, use fromPj() method to import data from pjsua_transport_info.

Location:

pjproject/branches/projects/pjsua2

Files:

• pjsip-apps/src/swig/pjsua2.i (modified) (1 diff)
• pjsip/include/pjsua2/siptypes.hpp (modified) (1 diff)
• pjsip/src/pjsua2/endpoint.cpp (modified) (1 diff)
• pjsip/src/pjsua2/siptypes.cpp (modified) (1 diff)

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/pjsua2.i

@@ -68 +68 @@
 %include "pjsua2/persistent.hpp"
 
-%ignore pj::TransportInfo::TransportInfo(const pjsua_transport_info &info);
 %include "pjsua2/siptypes.hpp"
 

pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/siptypes.hpp

@@ -394 +394 @@
     unsigned                usageCount;
 
-    /** Construct from pjsip */
-    TransportInfo(const pjsua_transport_info &info);
-
+    /** Construct from pjsua_transport_info */
+    void fromPj(const pjsua_transport_info &info);
 };
 

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/endpoint.cpp

@@ -950 +950 @@
 TransportInfo Endpoint::transportGetInfo(TransportId id) throw(Error)
 {
-    pjsua_transport_info tinfo;
-
-    PJSUA2_CHECK_EXPR( pjsua_transport_get_info(id, &tinfo) );
-
-    return TransportInfo(tinfo);
+    pjsua_transport_info pj_tinfo;
+    TransportInfo tinfo;
+
+    PJSUA2_CHECK_EXPR( pjsua_transport_get_info(id, &pj_tinfo) );
+    tinfo.fromPj(pj_tinfo);
+
+    return tinfo;
 }
 

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/siptypes.cpp

@@ -300 +300 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-TransportInfo::TransportInfo(const pjsua_transport_info &info)
+void TransportInfo::fromPj(const pjsua_transport_info &info)
 {
     this->id = info.id;