Changeset 4193
- Timestamp:
- Jul 3, 2012 7:51:53 AM (12 years ago)
- Location:
- pjproject/branches/projects/android/pjmedia
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/projects/android/pjmedia/build/Makefile
r4150 r4193 82 82 export PJMEDIA_AUDIODEV_OBJS += audiodev.o audiotest.o errno.o \ 83 83 coreaudio_dev.o legacy_dev.o null_dev.o pa_dev.o wmme_dev.o \ 84 alsa_dev.o bb10_dev.o 84 alsa_dev.o bb10_dev.o opensl_dev.o 85 85 export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS) 86 86 -
pjproject/branches/projects/android/pjmedia/include/pjmedia-audiodev/config.h
r4150 r4193 56 56 # define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO 1 57 57 # endif 58 #endif 59 60 /** 61 * This setting controls whether Android OpenSL audio support should be 62 * included. 63 */ 64 #ifndef PJMEDIA_AUDIO_DEV_HAS_OPENSL 65 # define PJMEDIA_AUDIO_DEV_HAS_OPENSL 0 58 66 #endif 59 67 -
pjproject/branches/projects/android/pjmedia/src/pjmedia-audiodev/audiodev.c
r4150 r4193 79 79 #endif 80 80 81 #if PJMEDIA_AUDIO_DEV_HAS_OPENSL 82 pjmedia_aud_dev_factory* pjmedia_opensl_factory(pj_pool_factory *pf); 83 #endif 84 81 85 #if PJMEDIA_AUDIO_DEV_HAS_BB10 82 86 pjmedia_aud_dev_factory* pjmedia_bb10_factory(pj_pool_factory *pf); … … 392 396 393 397 /* Register creation functions */ 398 #if PJMEDIA_AUDIO_DEV_HAS_OPENSL 399 aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_opensl_factory; 400 #endif 394 401 #if PJMEDIA_AUDIO_DEV_HAS_BB10 395 402 aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_bb10_factory;
Note: See TracChangeset
for help on using the changeset viewer.