summaryrefslogtreecommitdiff
path: root/pjmedia/include
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2013-03-11 06:32:58 +0000
committerNanang Izzuddin <nanang@teluu.com>2013-03-11 06:32:58 +0000
commit92de554adbf95a303f1051d85bef05abac9f1e8a (patch)
tree17019c03731e797280398e58b99044862341834a /pjmedia/include
parent2c2752f536e55bff7055eed2ed8e558163e1f9b6 (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/include')
-rw-r--r--pjmedia/include/pjmedia-audiodev/config.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/pjmedia/include/pjmedia-audiodev/config.h b/pjmedia/include/pjmedia-audiodev/config.h
index 6ba4605a..66f45a72 100644
--- a/pjmedia/include/pjmedia-audiodev/config.h
+++ b/pjmedia/include/pjmedia-audiodev/config.h
@@ -58,6 +58,22 @@ PJ_BEGIN_DECL
#endif
/**
+ * This setting controls whether Android OpenSL audio support should be
+ * included.
+ */
+#ifndef PJMEDIA_AUDIO_DEV_HAS_OPENSL
+# define PJMEDIA_AUDIO_DEV_HAS_OPENSL 0
+#endif
+
+/**
+ * This setting controls whether Android JNI audio support should be
+ * included.
+ */
+#ifndef PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI
+# define PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI 0
+#endif
+
+/**
* This setting controls whether BlackBerry 10 (BB10) audio support
* should be included.
*/