Ignore:
Timestamp:
May 17, 2010 12:51:06 PM (9 years ago)
Author:
ming
Message:

Merge #1051 into the main trunk.

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/pjmedia/src/pjmedia-audiodev/audiodev.c

    r3159 r3174  
    7171#endif 
    7272 
     73#if PJMEDIA_AUDIO_DEV_HAS_COREAUDIO 
     74pjmedia_aud_dev_factory* pjmedia_coreaudio_factory(pj_pool_factory *pf); 
     75#endif 
     76 
    7377#if PJMEDIA_AUDIO_DEV_HAS_ALSA 
    7478pjmedia_aud_dev_factory* pjmedia_alsa_factory(pj_pool_factory *pf); 
     
    379383#if PJMEDIA_AUDIO_DEV_HAS_ALSA 
    380384    aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_alsa_factory; 
     385#endif 
     386#if PJMEDIA_AUDIO_DEV_HAS_COREAUDIO 
     387    aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_coreaudio_factory; 
    381388#endif 
    382389#if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO 
Note: See TracChangeset for help on using the changeset viewer.