Ignore:
Timestamp:
Mar 12, 2009 6:11:37 PM (15 years ago)
Author:
bennylp
Message:

(Major) Task #737 and #738: integration of APS-Direct and Audiodev from aps-direct branch to trunk.

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/pjmedia/src/pjmedia/conference.c

    r2394 r2506  
    3434#include <pj/string.h> 
    3535 
     36#if !defined(PJMEDIA_CONF_USE_SWITCH_BOARD) || PJMEDIA_CONF_USE_SWITCH_BOARD==0 
    3637 
    3738/* CONF_DEBUG enables detailed operation of the conference bridge. 
     
    6465#define BYTES_PER_SAMPLE    2 
    6566 
    66 #define SIGNATURE           PJMEDIA_PORT_SIGNATURE('C', 'O', 'N', 'F') 
     67#define SIGNATURE           PJMEDIA_CONF_BRIDGE_SIGNATURE 
    6768#define SIGNATURE_PORT      PJMEDIA_PORT_SIGNATURE('C', 'O', 'N', 'P') 
    6869/* Normal level is hardcodec to 128 in all over places */ 
     
    465466 
    466467    if ((conf->options & PJMEDIA_CONF_NO_DEVICE) == 0) { 
    467         pjmedia_snd_stream *strm; 
    468         pjmedia_snd_stream_info si; 
     468        pjmedia_aud_stream *strm; 
     469        pjmedia_aud_param param; 
    469470 
    470471        /* 
     
    494495 
    495496        strm = pjmedia_snd_port_get_snd_stream(conf->snd_dev_port); 
    496         status = pjmedia_snd_stream_get_info(strm, &si); 
     497        status = pjmedia_aud_stream_get_param(strm, &param); 
    497498        if (status == PJ_SUCCESS) { 
    498             const pjmedia_snd_dev_info *snd_dev_info; 
     499            pjmedia_aud_dev_info snd_dev_info; 
    499500            if (conf->options & PJMEDIA_CONF_NO_MIC) 
    500                 snd_dev_info = pjmedia_snd_get_dev_info(si.play_id); 
     501                pjmedia_aud_dev_get_info(param.play_id, &snd_dev_info); 
    501502            else 
    502                 snd_dev_info = pjmedia_snd_get_dev_info(si.rec_id); 
    503             pj_strdup2_with_null(pool, &conf_port->name, snd_dev_info->name); 
     503                pjmedia_aud_dev_get_info(param.rec_id, &snd_dev_info); 
     504            pj_strdup2_with_null(pool, &conf_port->name, snd_dev_info.name); 
    504505        } 
    505506    } 
     
    11711172    info->listener_cnt = conf_port->listener_cnt; 
    11721173    info->listener_slots = conf_port->listener_slots; 
     1174    info->transmitter_cnt = conf_port->transmitter_cnt; 
    11731175    info->clock_rate = conf_port->clock_rate; 
    11741176    info->channel_count = conf_port->channel_count; 
     
    19881990} 
    19891991 
     1992#endif 
Note: See TracChangeset for help on using the changeset viewer.