diff options
author | Liong Sauw Ming <ming@teluu.com> | 2010-05-17 12:51:06 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2010-05-17 12:51:06 +0000 |
commit | 49aea0237b6e2134fe31c551f21e8148c884e140 (patch) | |
tree | 24462ee769fa28c20b0949c1bdb308de6189b84a /pjmedia/src/pjmedia-audiodev/audiodev.c | |
parent | f2d5263f261f4d2a1b714b3b91cc4229b86ad01d (diff) |
Merge #1051 into the main trunk.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3174 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia-audiodev/audiodev.c')
-rw-r--r-- | pjmedia/src/pjmedia-audiodev/audiodev.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pjmedia/src/pjmedia-audiodev/audiodev.c b/pjmedia/src/pjmedia-audiodev/audiodev.c index 16c4a742..0689cc94 100644 --- a/pjmedia/src/pjmedia-audiodev/audiodev.c +++ b/pjmedia/src/pjmedia-audiodev/audiodev.c @@ -70,6 +70,10 @@ static struct cap_info pjmedia_aud_dev_factory* pjmedia_pa_factory(pj_pool_factory *pf); #endif +#if PJMEDIA_AUDIO_DEV_HAS_COREAUDIO +pjmedia_aud_dev_factory* pjmedia_coreaudio_factory(pj_pool_factory *pf); +#endif + #if PJMEDIA_AUDIO_DEV_HAS_ALSA pjmedia_aud_dev_factory* pjmedia_alsa_factory(pj_pool_factory *pf); #endif @@ -379,6 +383,9 @@ PJ_DEF(pj_status_t) pjmedia_aud_subsys_init(pj_pool_factory *pf) #if PJMEDIA_AUDIO_DEV_HAS_ALSA aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_alsa_factory; #endif +#if PJMEDIA_AUDIO_DEV_HAS_COREAUDIO + aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_coreaudio_factory; +#endif #if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_pa_factory; #endif |