diff options
author | Benny Prijono <bennylp@teluu.com> | 2009-03-12 18:11:37 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2009-03-12 18:11:37 +0000 |
commit | 1dacdee696b7591a6dcc0b3c1d0f41573e473168 (patch) | |
tree | 302b09dcd989c0c05cf09f6aebaa63d870b421b9 /pjmedia/src/pjmedia/conference.c | |
parent | ba9d8ca28eb209571c0bd6a080a8bb03d0fa2d33 (diff) |
(Major) Task #737 and #738: integration of APS-Direct and Audiodev from aps-direct branch to trunk.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2506 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia/conference.c')
-rw-r--r-- | pjmedia/src/pjmedia/conference.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pjmedia/src/pjmedia/conference.c b/pjmedia/src/pjmedia/conference.c index 9cae6a74..c39ec036 100644 --- a/pjmedia/src/pjmedia/conference.c +++ b/pjmedia/src/pjmedia/conference.c @@ -33,6 +33,7 @@ #include <pj/pool.h> #include <pj/string.h> +#if !defined(PJMEDIA_CONF_USE_SWITCH_BOARD) || PJMEDIA_CONF_USE_SWITCH_BOARD==0 /* CONF_DEBUG enables detailed operation of the conference bridge. * Beware that it prints large amounts of logs (several lines per frame). @@ -63,7 +64,7 @@ static FILE *fhnd_rec; #define BYTES_PER_SAMPLE 2 -#define SIGNATURE PJMEDIA_PORT_SIGNATURE('C', 'O', 'N', 'F') +#define SIGNATURE PJMEDIA_CONF_BRIDGE_SIGNATURE #define SIGNATURE_PORT PJMEDIA_PORT_SIGNATURE('C', 'O', 'N', 'P') /* Normal level is hardcodec to 128 in all over places */ #define NORMAL_LEVEL 128 @@ -464,8 +465,8 @@ static pj_status_t create_sound_port( pj_pool_t *pool, /* Create sound device port: */ if ((conf->options & PJMEDIA_CONF_NO_DEVICE) == 0) { - pjmedia_snd_stream *strm; - pjmedia_snd_stream_info si; + pjmedia_aud_stream *strm; + pjmedia_aud_param param; /* * If capture is disabled then create player only port. @@ -493,14 +494,14 @@ static pj_status_t create_sound_port( pj_pool_t *pool, return status; strm = pjmedia_snd_port_get_snd_stream(conf->snd_dev_port); - status = pjmedia_snd_stream_get_info(strm, &si); + status = pjmedia_aud_stream_get_param(strm, ¶m); if (status == PJ_SUCCESS) { - const pjmedia_snd_dev_info *snd_dev_info; + pjmedia_aud_dev_info snd_dev_info; if (conf->options & PJMEDIA_CONF_NO_MIC) - snd_dev_info = pjmedia_snd_get_dev_info(si.play_id); + pjmedia_aud_dev_get_info(param.play_id, &snd_dev_info); else - snd_dev_info = pjmedia_snd_get_dev_info(si.rec_id); - pj_strdup2_with_null(pool, &conf_port->name, snd_dev_info->name); + pjmedia_aud_dev_get_info(param.rec_id, &snd_dev_info); + pj_strdup2_with_null(pool, &conf_port->name, snd_dev_info.name); } } @@ -1170,6 +1171,7 @@ PJ_DEF(pj_status_t) pjmedia_conf_get_port_info( pjmedia_conf *conf, info->rx_setting = conf_port->rx_setting; info->listener_cnt = conf_port->listener_cnt; info->listener_slots = conf_port->listener_slots; + info->transmitter_cnt = conf_port->transmitter_cnt; info->clock_rate = conf_port->clock_rate; info->channel_count = conf_port->channel_count; info->samples_per_frame = conf_port->samples_per_frame; @@ -1987,3 +1989,4 @@ static pj_status_t put_frame(pjmedia_port *this_port, return status; } +#endif |