diff options
author | Liong Sauw Ming <ming@teluu.com> | 2011-12-01 10:49:07 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2011-12-01 10:49:07 +0000 |
commit | c04000a192a00f047ea6d04e131e42f0b72bc11b (patch) | |
tree | a3f1a4ba2cd467087640c5cb2bd9509570c5acff /pjsip/src/pjsua-lib/pjsua_media.c | |
parent | 5a41db1f3ba90b676e9485a15841e5fec656ed58 (diff) |
Closed #1420: Add support for event manager
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3893 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib/pjsua_media.c')
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 3eb8cee6..e938247f 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -1253,14 +1253,13 @@ static void sort_media(const pjmedia_sdp_session *sdp, } /* Callback to receive media events */ -static pj_status_t call_media_on_event(pjmedia_event_subscription *esub, - pjmedia_event *event) +pj_status_t call_media_on_event(pjmedia_event *event, + void *user_data) { - pjsua_call_media *call_med = (pjsua_call_media*)esub->user_data; + pjsua_call_media *call_med = (pjsua_call_media*)user_data; pjsua_call *call = call_med->call; if (pjsua_var.ua_cfg.cb.on_call_media_event && call) { - ++event->proc_cnt; (*pjsua_var.ua_cfg.cb.on_call_media_event)(call->index, call_med->idx, event); } @@ -1424,12 +1423,6 @@ pj_status_t pjsua_call_media_init(pjsua_call_media *call_med, pjmedia_vid_dev_get_info(call_med->strm.v.cap_dev, &info); call_med->strm.v.cap_dev = info.id; } - - /* Init event subscribtion */ - pjmedia_event_subscription_init(&call_med->esub_rend, &call_media_on_event, - call_med); - pjmedia_event_subscription_init(&call_med->esub_cap, &call_media_on_event, - call_med); } #endif |