Ignore:
Timestamp:
May 11, 2007 3:14:34 PM (14 years ago)
Author:
bennylp
Message:

HUGE changeset to make the rest of the libraries compile with C++ mode

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia/sound_port.c

    r1202 r1266  
    7474                           /* out */  unsigned size) 
    7575{ 
    76     pjmedia_snd_port *snd_port = user_data; 
     76    pjmedia_snd_port *snd_port = (pjmedia_snd_port*) user_data; 
    7777    pjmedia_port *port; 
    7878    pjmedia_frame frame; 
     
    112112 
    113113    if (snd_port->plc) 
    114         pjmedia_plc_save(snd_port->plc, output); 
     114        pjmedia_plc_save(snd_port->plc, (pj_int16_t*) output); 
    115115 
    116116    if (snd_port->ec_state) { 
     
    121121        } 
    122122        snd_port->ec_suspend_count = 0; 
    123         pjmedia_echo_playback(snd_port->ec_state, output); 
     123        pjmedia_echo_playback(snd_port->ec_state, (pj_int16_t*)output); 
    124124    } 
    125125 
     
    137137        if (snd_port->ec_state) { 
    138138            /* To maintain correct delay in EC */ 
    139             pjmedia_echo_playback(snd_port->ec_state, output); 
     139            pjmedia_echo_playback(snd_port->ec_state, (pj_int16_t*)output); 
    140140        } 
    141141    } 
     
    144144    if (snd_port->plc) { 
    145145 
    146         pjmedia_plc_generate(snd_port->plc, output); 
     146        pjmedia_plc_generate(snd_port->plc, (pj_int16_t*) output); 
    147147#ifdef SIMULATE_LOST_PCT 
    148148        PJ_LOG(4,(THIS_FILE, "Lost frame generated")); 
     
    166166                          /* in*/    unsigned size) 
    167167{ 
    168     pjmedia_snd_port *snd_port = user_data; 
     168    pjmedia_snd_port *snd_port = (pjmedia_snd_port*) user_data; 
    169169    pjmedia_port *port; 
    170170    pjmedia_frame frame; 
     
    182182    /* Cancel echo */ 
    183183    if (snd_port->ec_state && !snd_port->ec_suspended) { 
    184         pjmedia_echo_capture(snd_port->ec_state, input, 0); 
     184        pjmedia_echo_capture(snd_port->ec_state, (pj_int16_t*) input, 0); 
    185185    } 
    186186 
     
    327327    PJ_ASSERT_RETURN(pool && p_port, PJ_EINVAL); 
    328328 
    329     snd_port = pj_pool_zalloc(pool, sizeof(pjmedia_snd_port)); 
     329    snd_port = PJ_POOL_ZALLOC_T(pool, pjmedia_snd_port); 
    330330    PJ_ASSERT_RETURN(snd_port, PJ_ENOMEM); 
    331331 
     
    366366    PJ_ASSERT_RETURN(pool && p_port, PJ_EINVAL); 
    367367 
    368     snd_port = pj_pool_zalloc(pool, sizeof(pjmedia_snd_port)); 
     368    snd_port = PJ_POOL_ZALLOC_T(pool, pjmedia_snd_port); 
    369369    PJ_ASSERT_RETURN(snd_port, PJ_ENOMEM); 
    370370 
     
    403403    PJ_ASSERT_RETURN(pool && p_port, PJ_EINVAL); 
    404404 
    405     snd_port = pj_pool_zalloc(pool, sizeof(pjmedia_snd_port)); 
     405    snd_port = PJ_POOL_ZALLOC_T(pool, pjmedia_snd_port); 
    406406    PJ_ASSERT_RETURN(snd_port, PJ_ENOMEM); 
    407407 
Note: See TracChangeset for help on using the changeset viewer.