From c04000a192a00f047ea6d04e131e42f0b72bc11b Mon Sep 17 00:00:00 2001
From: Liong Sauw Ming <ming@teluu.com>
Date: Thu, 1 Dec 2011 10:49:07 +0000
Subject: Closed #1420: Add support for event manager

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3893 74dad513-b988-da41-8d7b-12977e46ad98
---
 pjmedia/src/pjmedia-videodev/colorbar_dev.c |  1 -
 pjmedia/src/pjmedia-videodev/dshow_dev.c    |  1 -
 pjmedia/src/pjmedia-videodev/ffmpeg_dev.c   |  1 -
 pjmedia/src/pjmedia-videodev/sdl_dev.c      | 10 ++++------
 pjmedia/src/pjmedia-videodev/videodev.c     |  6 ------
 5 files changed, 4 insertions(+), 15 deletions(-)

(limited to 'pjmedia/src/pjmedia-videodev')

diff --git a/pjmedia/src/pjmedia-videodev/colorbar_dev.c b/pjmedia/src/pjmedia-videodev/colorbar_dev.c
index e0d488da..6fb658ef 100644
--- a/pjmedia/src/pjmedia-videodev/colorbar_dev.c
+++ b/pjmedia/src/pjmedia-videodev/colorbar_dev.c
@@ -416,7 +416,6 @@ static pj_status_t cbar_factory_create_stream(
     strm->cbfi = cbfi;
     pj_memcpy(&strm->vafp, &vafp, sizeof(vafp));
     strm->ts_inc = PJMEDIA_SPF2(param->clock_rate, &vfd->fps, 1);
-    pjmedia_event_publisher_init(&strm->base.epub, PJMEDIA_SIG_VID_DEV_COLORBAR);
 
     for (i = 0; i < vfi->plane_cnt; ++i) {
         strm->first_line[i] = pj_pool_alloc(pool, vafp.strides[i]);
diff --git a/pjmedia/src/pjmedia-videodev/dshow_dev.c b/pjmedia/src/pjmedia-videodev/dshow_dev.c
index f65ed921..c116875f 100644
--- a/pjmedia/src/pjmedia-videodev/dshow_dev.c
+++ b/pjmedia/src/pjmedia-videodev/dshow_dev.c
@@ -869,7 +869,6 @@ static pj_status_t dshow_factory_create_stream(
     strm->pool = pool;
     pj_memcpy(&strm->vid_cb, cb, sizeof(*cb));
     strm->user_data = user_data;
-    pjmedia_event_publisher_init(&strm->base.epub, PJMEDIA_SIG_VID_DEV_DSHOW);
 
     if (param->dir & PJMEDIA_DIR_CAPTURE) {
 	const pjmedia_video_format_detail *vfd;
diff --git a/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c b/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c
index 9f874077..1bfc0c27 100644
--- a/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c
+++ b/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c
@@ -383,7 +383,6 @@ static pj_status_t ffmpeg_factory_create_stream(
     strm->factory = (ffmpeg_factory*)f;
     strm->pool = pool;
     pj_memcpy(&strm->param, param, sizeof(*param));
-    pjmedia_event_publisher_init(&strm->base.epub);
 
     /* Done */
     strm->base.op = &stream_op;
diff --git a/pjmedia/src/pjmedia-videodev/sdl_dev.c b/pjmedia/src/pjmedia-videodev/sdl_dev.c
index 465e37b5..109b22bd 100644
--- a/pjmedia/src/pjmedia-videodev/sdl_dev.c
+++ b/pjmedia/src/pjmedia-videodev/sdl_dev.c
@@ -308,7 +308,7 @@ static struct sdl_stream* find_stream(struct sdl_factory *sf,
  
     if (strm)
         pjmedia_event_init(pevent, PJMEDIA_EVENT_NONE, &strm->last_ts,
-		           &strm->base.epub);
+		           strm);
 
     return strm;
 }
@@ -354,7 +354,7 @@ static pj_status_t handle_event(void *data)
         if (strm && pevent.type != PJMEDIA_EVENT_NONE) {
             pj_status_t status;
 
-	    pjmedia_event_publish(&strm->base.epub, &pevent);
+	    pjmedia_event_publish(NULL, strm, &pevent, 0);
 
 	    switch (pevent.type) {
 	    case PJMEDIA_EVENT_WND_RESIZED:
@@ -375,9 +375,8 @@ static pj_status_t handle_event(void *data)
 		sdl_stream_stop(&strm->base);
                 sdl_destroy_all(strm);
                 pjmedia_event_init(&pevent, PJMEDIA_EVENT_WND_CLOSED,
-                                   &strm->last_ts,
-                                   &strm->base.epub);
-                pjmedia_event_publish(&strm->base.epub, &pevent);
+                                   &strm->last_ts, strm);
+                pjmedia_event_publish(NULL, strm, &pevent, 0);
 
                 /*
                  * Note: don't access the stream after this point, it
@@ -916,7 +915,6 @@ static pj_status_t sdl_factory_create_stream(
     strm->sf = sf;
     pj_memcpy(&strm->vid_cb, cb, sizeof(*cb));
     strm->user_data = user_data;
-    pjmedia_event_publisher_init(&strm->base.epub, PJMEDIA_SIG_VID_DEV_SDL);
 
     /* Create render stream here */
     if (param->dir & PJMEDIA_DIR_RENDER) {
diff --git a/pjmedia/src/pjmedia-videodev/videodev.c b/pjmedia/src/pjmedia-videodev/videodev.c
index 9a82ba6e..9b96520d 100644
--- a/pjmedia/src/pjmedia-videodev/videodev.c
+++ b/pjmedia/src/pjmedia-videodev/videodev.c
@@ -785,12 +785,6 @@ PJ_DEF(pj_status_t) pjmedia_vid_dev_stream_set_cap(
     return strm->op->set_cap(strm, cap, value);
 }
 
-PJ_DEF(pjmedia_event_publisher*)
-pjmedia_vid_dev_stream_get_event_publisher(pjmedia_vid_dev_stream *strm)
-{
-    return &strm->epub;
-}
-
 /* API: Start the stream. */
 PJ_DEF(pj_status_t) pjmedia_vid_dev_stream_start(pjmedia_vid_dev_stream *strm)
 {
-- 
cgit v1.2.3