Changeset 3174 for pjproject/trunk/pjmedia/src/pjmedia-audiodev/coreaudio_dev.c

Timestamp:

May 17, 2010 12:51:06 PM (14 years ago)

Author:

ming

Message:

Merge #1051 into the main trunk.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia-audiodev/coreaudio_dev.c (copied) (copied from pjproject/branches/projects/iphone/pjmedia/src/pjmedia-audiodev/coreaudio_dev.c) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/coreaudio_dev.c

@@ -24 +24 @@
 #if PJMEDIA_AUDIO_DEV_HAS_COREAUDIO
 
+#include "TargetConditionals.h"
+#if TARGET_OS_IPHONE
+    #define COREAUDIO_MAC 0
+#else
+    #define COREAUDIO_MAC 1
+#endif
+
 #include <AudioUnit/AudioUnit.h>
 #if !COREAUDIO_MAC
@@ -29 +36 @@
 
     #define AudioDeviceID unsigned
+
+    /* For iPhone 2.x and earlier */
+    #if __IPHONE_OS_VERSION_MIN_REQUIRED <= __IPHONE_2_2
+        #define kAudioUnitSubType_VoiceProcessingIO kAudioUnitSubType_RemoteIO
+        #define kAudioSessionProperty_OverrideCategoryEnableBluetoothInput -1
+    #endif
+
 #endif
 
@@ -40 +54 @@
     #define AudioComponentInstanceDispose CloseComponent
 #endif
+
 
 #define THIS_FILE               "coreaudio_dev.c"
@@ -194 +209 @@
     AudioDeviceID *dev_ids;
     UInt32 buf_size, dev_size, size = sizeof(AudioDeviceID);
-    AudioBufferList *buf;
+    AudioBufferList *buf = NULL;
     OSStatus ostatus;
 #endif
@@ -724 +739 @@
 
     if (inID == kAudioSessionProperty_AudioRouteChange) {
-        pj_status_t status;
 
         PJ_LOG(3, (THIS_FILE, "audio route changed"));