Changeset 5513 for pjproject/branches/projects/uwp/pjmedia/src/pjmedia-audiodev/coreaudio_dev.m

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia-audiodev/coreaudio_dev.m (modified) (4 diffs)

pjproject/branches/projects/uwp/pjmedia/src/pjmedia-audiodev/coreaudio_dev.m

@@ -53 +53 @@
     /* Starting iOS SDK 7, Audio Session API is deprecated. */
     #define USE_AUDIO_SESSION_API 0
+
+    /* For better integration with CallKit features (available starting
+     * in iOS 10), let the application setup and manage its own
+     * audio session.
+     */
+    #define SETUP_AV_AUDIO_SESSION  0
 #endif
 
@@ -336 +342 @@
 #endif
 
+#if SETUP_AV_AUDIO_SESSION
     /* Initialize audio session category and mode */
     {
@@ -361 +368 @@
         }
     }
+#endif
 
     cf_instance = cf;
@@ -2081 +2089 @@
     pj_mutex_unlock(stream->cf->mutex);
 
-#if !COREAUDIO_MAC
+#if !COREAUDIO_MAC && SETUP_AV_AUDIO_SESSION
     if (should_deactivate) {
         if ([stream->sess