From 45ace555d7b736e020f2d0dcc892d39765189670 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Mon, 29 Aug 2011 02:38:01 +0000 Subject: Fixed compilation error on conf_switch.c if PJMEDIA_CONF_USE_SWITCH_BOARD is enabled (re #1320, thanks Bo Shi for the report) git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3730 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia/conf_switch.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pjmedia/src/pjmedia/conf_switch.c b/pjmedia/src/pjmedia/conf_switch.c index 4299a872..f5d6b78c 100644 --- a/pjmedia/src/pjmedia/conf_switch.c +++ b/pjmedia/src/pjmedia/conf_switch.c @@ -167,7 +167,7 @@ static pj_status_t create_conf_port( pj_pool_t *pool, /* Save some port's infos, for convenience. */ conf_port->port = port; conf_port->info = &port->info; - conf_port->samples_per_frame= PJMEDIA_PINFO_SAMPLES_PER_FRAME(&port->info); + conf_port->samples_per_frame = PJMEDIA_PIA_SPF(&port->info); /* Init pjmedia_frame structure in the TX buffer. */ f = (pjmedia_frame*)conf_port->tx_buf; @@ -1227,8 +1227,7 @@ static pj_status_t get_frame(pjmedia_port *this_port, /* Var "ci" is to count how many ports have been visited so far. */ ++ci; - master_samples_per_frame = PJMEDIA_PINFO_SAMPLES_PER_FRAME( - &conf->master_port->info); + master_samples_per_frame = PJMEDIA_PIA_SPF(&conf->master_port->info); /* Update clock of the port. */ pj_add_timestamp32(&cport->ts_clock, master_samples_per_frame); -- cgit v1.2.3