summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2006-02-21 23:45:06 +0000
committerBenny Prijono <bennylp@teluu.com>2006-02-21 23:45:06 +0000
commit5c7386b0e38e69ae6b275b1048d59e7ec4eaf6bf (patch)
treee7af37b1df87d812cb33150aec344d7943322620
parent255d862c07c95ca33bba5a0c2f35e8aecb593fed (diff)
Fixed crashed bug when sound is closed, and added msg when port is (dis)connected
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@211 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjmedia/src/pjmedia/conference.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/pjmedia/src/pjmedia/conference.c b/pjmedia/src/pjmedia/conference.c
index 8677499d..530815f1 100644
--- a/pjmedia/src/pjmedia/conference.c
+++ b/pjmedia/src/pjmedia/conference.c
@@ -362,11 +362,7 @@ PJ_DEF(pj_status_t) pjmedia_conf_destroy( pjmedia_conf *conf )
PJ_ASSERT_RETURN(conf != NULL, PJ_EINVAL);
suspend_sound(conf);
-
- pj_snd_stream_close(conf->snd_rec);
- conf->snd_rec = NULL;
- pj_snd_stream_close(conf->snd_player);
- conf->snd_player = NULL;
+ destroy_sound(conf);
return PJ_SUCCESS;
}
@@ -475,7 +471,7 @@ PJ_DEF(pj_status_t) pjmedia_conf_connect_port( pjmedia_conf *conf,
if (conf->connect_cnt == 1)
resume_sound(conf);
- PJ_LOG(5,(THIS_FILE,"Port %.*s transmitting to port %.*s",
+ PJ_LOG(4,(THIS_FILE,"Port %.*s transmitting to port %.*s",
(int)src_port->name.slen,
src_port->name.ptr,
(int)dst_port->name.slen,
@@ -510,7 +506,7 @@ PJ_DEF(pj_status_t) pjmedia_conf_disconnect_port( pjmedia_conf *conf,
src_port->listeners[sink_slot] = 0;
--conf->connect_cnt;
- PJ_LOG(5,(THIS_FILE,"Port %.*s stop transmitting to port %.*s",
+ PJ_LOG(4,(THIS_FILE,"Port %.*s stop transmitting to port %.*s",
(int)src_port->name.slen,
src_port->name.ptr,
(int)dst_port->name.slen,