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

Timestamp:

Dec 13, 2013 11:44:51 AM (11 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/endpoint.cpp (modified) (4 diffs)

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

@@ -384 +384 @@
     }
 
+    delete writer;
+    
+    while(mediaList.size() > 0) {
+        AudioMedia *cur_media = mediaList[0];
+        delete cur_media; /* this will remove itself from the list */
+    }
+
+    clearCodecInfoList();
+
     try {
         libDestroy();
@@ -390 +399 @@
         PJ_UNUSED_ARG(err);
     }
-    delete writer;
-    
-    while(mediaList.size() > 0) {
-        AudioMedia *cur_media = mediaList[0];
-        delete cur_media; /* this will remove itself from the list */
-    }
-
-    clearCodecInfoList();
 
     instance_ = NULL;
@@ -1567 +1568 @@
     PJSUA2_CHECK_EXPR( pjsua_enum_codecs(pj_codec, &count) );
 
+    pj_enter_critical_section();
     clearCodecInfoList();
-
-    pj_enter_critical_section();
     for (unsigned i=0;(i<count && i<MAX_CODEC_NUM);++i) {
         CodecInfo *codec_info = new CodecInfo;
@@ -1608 +1608 @@
 void Endpoint::clearCodecInfoList()
 {
-    pj_enter_critical_section();
     for (unsigned i=0;i<codecInfoList.size();++i) {
         delete codecInfoList[i];
     }
     codecInfoList.clear();
-    pj_leave_critical_section();
-}
+}