Ignore:
Timestamp:
May 17, 2010 12:51:06 PM (9 years ago)
Author:
ming
Message:

Merge #1051 into the main trunk.

Location:
pjproject/trunk
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

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

    r3127 r3174  
    2424#if PJMEDIA_AUDIO_DEV_HAS_COREAUDIO 
    2525 
     26#include "TargetConditionals.h" 
     27#if TARGET_OS_IPHONE 
     28    #define COREAUDIO_MAC 0 
     29#else 
     30    #define COREAUDIO_MAC 1 
     31#endif 
     32 
    2633#include <AudioUnit/AudioUnit.h> 
    2734#if !COREAUDIO_MAC 
     
    2936 
    3037    #define AudioDeviceID unsigned 
     38 
     39    /* For iPhone 2.x and earlier */ 
     40    #if __IPHONE_OS_VERSION_MIN_REQUIRED <= __IPHONE_2_2 
     41        #define kAudioUnitSubType_VoiceProcessingIO kAudioUnitSubType_RemoteIO 
     42        #define kAudioSessionProperty_OverrideCategoryEnableBluetoothInput -1 
     43    #endif 
     44 
    3145#endif 
    3246 
     
    4054    #define AudioComponentInstanceDispose CloseComponent 
    4155#endif 
     56 
    4257 
    4358#define THIS_FILE               "coreaudio_dev.c" 
     
    194209    AudioDeviceID *dev_ids; 
    195210    UInt32 buf_size, dev_size, size = sizeof(AudioDeviceID); 
    196     AudioBufferList *buf; 
     211    AudioBufferList *buf = NULL; 
    197212    OSStatus ostatus; 
    198213#endif 
     
    724739 
    725740    if (inID == kAudioSessionProperty_AudioRouteChange) { 
    726         pj_status_t status; 
    727741 
    728742        PJ_LOG(3, (THIS_FILE, "audio route changed")); 
Note: See TracChangeset for help on using the changeset viewer.