Changeset 3653 for pjproject

Timestamp:

Jul 15, 2011 6:37:07 AM (13 years ago)

Author:

bennylp

Message:

Re #1284 (event framework): unsubscribing does not need to know publisher

Location:

pjproject/branches/projects/2.0-dev/pjmedia

Files:

• include/pjmedia/event.h (modified) (3 diffs)
• src/pjmedia/event.c (modified) (1 diff)
• src/pjmedia/vid_port.c (modified) (1 diff)

pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia/event.h

@@ -261 +261 @@
     /** User data for this subscription */
     void                *user_data;
+
+    /** Current publisher it is subscribed to */
+    pjmedia_event_publisher *subscribe_to;
 };
 
@@ -335 +338 @@
 
 /**
- * Unsubscribe from the specified publisher.
- *
- * @param epub          The event publisher.
+ * Unsubscribe the specified subscription object from publisher it is
+ * currently subscribed to. If the subscription object is not currently
+ * subscribed to anything, the function will do nothing.
+ *
  * @param esub          The event subscription object, which must be the same
  *                      object that was given to #pjmedia_event_subscribe().
@@ -343 +347 @@
  * @return              PJ_SUCCESS on success or the appropriate error code.
  */
-PJ_DECL(pj_status_t) pjmedia_event_unsubscribe(pjmedia_event_publisher *epub,
-                                               pjmedia_event_subscription *esub);
+PJ_DECL(pj_status_t)
+pjmedia_event_unsubscribe(pjmedia_event_subscription *esub);
 
 /**

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/event.c

@@ -74 +74 @@
 {
     PJ_ASSERT_RETURN(epub && esub && esub->cb, PJ_EINVAL);
+    /* Must not currently subscribe to anything */
+    PJ_ASSERT_RETURN(esub->subscribe_to == NULL, PJ_EINVALIDOP);
+
     pj_list_push_back(&epub->subscription_list, esub);
+    esub->subscribe_to = epub;
     return PJ_SUCCESS;
 }
 
-PJ_DEF(pj_status_t) pjmedia_event_unsubscribe( pjmedia_event_publisher *epub,
-                                               pjmedia_event_subscription *esub)
+PJ_DEF(pj_status_t) pjmedia_event_unsubscribe(pjmedia_event_subscription *esub)
 {
-    PJ_ASSERT_RETURN(epub && esub, PJ_EINVAL);
-    PJ_ASSERT_RETURN(pj_list_find_node(&epub->subscription_list, esub)==esub,
-                     PJ_ENOTFOUND);
-    pj_list_erase(esub);
+    PJ_ASSERT_RETURN(esub, PJ_EINVAL);
+    if (esub->subscribe_to) {
+        PJ_ASSERT_RETURN(
+            pj_list_find_node(&esub->subscribe_to->subscription_list,
+                              esub)==esub, PJ_ENOTFOUND);
+        pj_list_erase(esub);
+        esub->subscribe_to = NULL;
+    }
     return PJ_SUCCESS;
 }

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_port.c

@@ -439 +439 @@
 
     if (vp->client_port) {
-        pjmedia_event_publisher *epub;
-
-        /* Unsubscribe event */
-        epub = pjmedia_port_get_event_publisher(vp->client_port);
-        if (epub && vp->esub_client_port.user_data) {
-            pjmedia_event_unsubscribe(epub, &vp->esub_client_port);
-            pj_bzero(&vp->esub_client_port, sizeof(vp->esub_client_port));
-        }
+        pjmedia_event_unsubscribe(&vp->esub_client_port);
         vp->client_port = NULL;
     }