Changeset 3999 for pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

Timestamp:

Mar 30, 2012 7:10:13 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/endpoint.c (modified) (8 diffs)

pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

@@ -25 +25 @@
 #include <pj/assert.h>
 #include <pj/ioqueue.h>
+#include <pj/lock.h>
 #include <pj/log.h>
 #include <pj/os.h>
@@ -58 +59 @@
 
 
+/* List of media endpoint exit callback. */
+typedef struct exit_cb
+{
+    PJ_DECL_LIST_MEMBER             (struct exit_cb);
+    pjmedia_endpt_exit_callback     func;
+} exit_cb;
+
+
 /** Concrete declaration of media endpoint. */
 struct pjmedia_endpt
@@ -87 +96 @@
     /** Is telephone-event enable */
     pj_bool_t             has_telephone_event;
+
+    /** List of exit callback. */
+    exit_cb               exit_cb_list;
 };
 
@@ -130 +142 @@
         goto on_error;
 
+    /* Initialize exit callback list. */
+    pj_list_init(&endpt->exit_cb_list);
+
     /* Create ioqueue if none is specified. */
     if (endpt->ioqueue == NULL) {
@@ -190 +205 @@
 PJ_DEF(pj_status_t) pjmedia_endpt_destroy (pjmedia_endpt *endpt)
 {
+    exit_cb *ecb;
     unsigned i;
 
@@ -215 +231 @@
     pjmedia_codec_mgr_destroy(&endpt->codec_mgr);
     pjmedia_aud_subsys_shutdown();
+
+    /* Call all registered exit callbacks */
+    ecb = endpt->exit_cb_list.next;
+    while (ecb != &endpt->exit_cb_list) {
+        (*ecb->func)(endpt);
+        ecb = ecb->next;
+    }
+
     pj_pool_release (endpt->pool);
 
@@ -435 +459 @@
 
         } else {
-            rtpmap.param.ptr = NULL;
+            rtpmap.param.ptr = "";
             rtpmap.param.slen = 0;
         }
@@ -897 +921 @@
     return PJ_SUCCESS;
 }
+
+PJ_DEF(pj_status_t) pjmedia_endpt_atexit( pjmedia_endpt *endpt,
+                                          pjmedia_endpt_exit_callback func)
+{
+    exit_cb *new_cb;
+
+    PJ_ASSERT_RETURN(endpt && func, PJ_EINVAL);
+
+    if (endpt->quit_flag)
+        return PJ_EINVALIDOP;
+
+    new_cb = PJ_POOL_ZALLOC_T(endpt->pool, exit_cb);
+    new_cb->func = func;
+
+    pj_enter_critical_section();
+    pj_list_push_back(&endpt->exit_cb_list, new_cb);
+    pj_leave_critical_section();
+
+    return PJ_SUCCESS;
+}