Changeset 4692 for pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/account.cpp

Timestamp:

Dec 13, 2013 11:44:51 AM (9 years ago)

Author:

nanang

Message:

Re #1519: Misc fixes in pjsua2:

• Changed AccountConfig::toPj() signature, because a pjsua_acc_config instance should not be copied/assigned to another pjsua_acc_config instance as it contains list.
• Fixed assertion in Endpoint destructor caused by access to pjlib mutex after pjlib is destroyed.
• Changed VS2005 sample_debug project to allow debugging C++ code such as pjsua2_demo.cpp.
• Compile warnings on VS2005.
• Fixed SWIG python unit test.

File:

• pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/account.cpp (modified) (4 diffs)

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

@@ -301 +301 @@
 
 /* Convert to pjsip. */
-pjsua_acc_config AccountConfig::toPj() const
-{
-    pjsua_acc_config ret;
+void AccountConfig::toPj(pjsua_acc_config &ret) const
+{
     unsigned i;
 
@@ -425 +424 @@
     ret.vid_stream_rc_cfg.method= videoConfig.rateControlMethod;
     ret.vid_stream_rc_cfg.bandwidth = videoConfig.rateControlBandwidth;
-
-    return ret;
 }
 
@@ -670 +667 @@
                      bool make_default) throw(Error)
 {
-    pjsua_acc_config pj_acc_cfg = acc_cfg.toPj();
-
+    pjsua_acc_config pj_acc_cfg;
+    
+    acc_cfg.toPj(pj_acc_cfg);
     pj_acc_cfg.user_data = (void*)this;
     PJSUA2_CHECK_EXPR( pjsua_acc_add(&pj_acc_cfg, make_default, &id) );
@@ -678 +676 @@
 void Account::modify(const AccountConfig &acc_cfg) throw(Error)
 {
-    pjsua_acc_config pj_acc_cfg = acc_cfg.toPj();
+    pjsua_acc_config pj_acc_cfg;
+    
+    acc_cfg.toPj(pj_acc_cfg);
     pj_acc_cfg.user_data = (void*)this;
     PJSUA2_CHECK_EXPR( pjsua_acc_modify(id, &pj_acc_cfg) );