diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2013-03-11 06:32:58 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2013-03-11 06:32:58 +0000 |
| commit | 92de554adbf95a303f1051d85bef05abac9f1e8a (patch) | |
| tree | 17019c03731e797280398e58b99044862341834a /pjmedia/src/pjmedia-audiodev/audiodev.c | |
| parent | 2c2752f536e55bff7055eed2ed8e558163e1f9b6 (diff) | |
Re #1639: merged android branch into trunk (except sample apps, i.e: apjsua & apjloader)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4435 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia-audiodev/audiodev.c')
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/audiodev.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pjmedia/src/pjmedia-audiodev/audiodev.c b/pjmedia/src/pjmedia-audiodev/audiodev.c index f9ee4175..4ccce9f8 100644 --- a/pjmedia/src/pjmedia-audiodev/audiodev.c +++ b/pjmedia/src/pjmedia-audiodev/audiodev.c @@ -78,6 +78,14 @@ pjmedia_aud_dev_factory* pjmedia_coreaudio_factory(pj_pool_factory *pf); pjmedia_aud_dev_factory* pjmedia_alsa_factory(pj_pool_factory *pf); #endif +#if PJMEDIA_AUDIO_DEV_HAS_OPENSL +pjmedia_aud_dev_factory* pjmedia_opensl_factory(pj_pool_factory *pf); +#endif + +#if PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI +pjmedia_aud_dev_factory* pjmedia_android_factory(pj_pool_factory *pf); +#endif + #if PJMEDIA_AUDIO_DEV_HAS_BB10 pjmedia_aud_dev_factory* pjmedia_bb10_factory(pj_pool_factory *pf); #endif @@ -395,6 +403,12 @@ PJ_DEF(pj_status_t) pjmedia_aud_subsys_init(pj_pool_factory *pf) aud_subsys.dev_cnt = 0; /* Register creation functions */ +#if PJMEDIA_AUDIO_DEV_HAS_OPENSL + aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_opensl_factory; +#endif +#if PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI + aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_android_factory; +#endif #if PJMEDIA_AUDIO_DEV_HAS_BB10 aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_bb10_factory; #endif |