Changeset 3893 for pjproject/trunk/pjsip-apps/src/samples/aviplay.c

Timestamp:

Dec 1, 2011 10:49:07 AM (12 years ago)

Author:

ming

Message:

Closed #1420: Add support for event manager

File:

• pjproject/trunk/pjsip-apps/src/samples/aviplay.c (modified) (6 diffs)

pjproject/trunk/pjsip-apps/src/samples/aviplay.c

@@ -106 +106 @@
 } codec_port_data_t;
 
-static pj_status_t avi_event_cb(pjmedia_event_subscription *esub,
-                                pjmedia_event *event)
-{
-    avi_port_t *ap = (avi_port_t *)esub->user_data;
+static pj_status_t avi_event_cb(pjmedia_event *event,
+                                void *user_data)
+{
+    avi_port_t *ap = (avi_port_t *)user_data;
     
     switch (event->type) {
@@ -192 +192 @@
     pjmedia_port *vid_port = NULL, *aud_port = NULL;
     pjmedia_vid_codec *codec=NULL;
-    pjmedia_event_subscription esub;
     avi_port_t avi_port;
     
@@ -403 +402 @@
 
         /* subscribe events */
-        pjmedia_event_subscription_init(&esub, &avi_event_cb, &avi_port);
-        pjmedia_event_subscribe(
-                pjmedia_vid_port_get_event_publisher(renderer),
-                &esub);
+        pjmedia_event_subscribe(NULL, pool, &avi_event_cb, &avi_port,
+                                renderer);
 
         if (snd_port) {
@@ -437 +434 @@
         pjmedia_snd_port_destroy(snd_port);
     }
-    if (renderer)
+    if (renderer) {
+        pjmedia_event_unsubscribe(NULL, &avi_event_cb, &avi_port,
+                                  renderer);
         pjmedia_vid_port_destroy(renderer);
+    }
     if (aud_port)
         pjmedia_port_destroy(aud_port);
@@ -483 +483 @@
     pjmedia_video_format_mgr_create(pool, 64, 0, NULL);
     pjmedia_converter_mgr_create(pool, NULL);
+    pjmedia_event_mgr_create(pool, 0, NULL);
     pjmedia_vid_codec_mgr_create(pool, NULL);
     
@@ -520 +521 @@
     pjmedia_video_format_mgr_destroy(pjmedia_video_format_mgr_instance());
     pjmedia_converter_mgr_destroy(pjmedia_converter_mgr_instance());
+    pjmedia_event_mgr_destroy(pjmedia_event_mgr_instance());
     pjmedia_vid_codec_mgr_destroy(pjmedia_vid_codec_mgr_instance());