diff options
author | Liong Sauw Ming <ming@teluu.com> | 2013-05-29 03:53:15 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2013-05-29 03:53:15 +0000 |
commit | f2d7cc657996fe0e0f5f04c45b32159557e6642c (patch) | |
tree | 5d192440df1c1c326d4b857f16987e079ad86ed8 /pjmedia | |
parent | 3ee10ffd42c60b7e4ba79cae3c59323da2fd4aac (diff) |
Re #1630 (misc): Fixed typo and missing include in coreaudio dev
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4527 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
-rw-r--r-- | pjmedia/src/pjmedia-audiodev/coreaudio_dev.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pjmedia/src/pjmedia-audiodev/coreaudio_dev.c b/pjmedia/src/pjmedia-audiodev/coreaudio_dev.c index d0718979..07d4973c 100644 --- a/pjmedia/src/pjmedia-audiodev/coreaudio_dev.c +++ b/pjmedia/src/pjmedia-audiodev/coreaudio_dev.c @@ -32,7 +32,9 @@ #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioConverter.h> -#if !COREAUDIO_MAC +#if COREAUDIO_MAC + #include <CoreAudio/CoreAudio.h> +#else #include <AudioToolbox/AudioServices.h> #define AudioDeviceID unsigned @@ -444,7 +446,7 @@ static pj_status_t ca_factory_refresh(pjmedia_aud_dev_factory *f) ostatus = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, NULL, &size, (void *)&dev_id); - if (ostatus != noErr && dev_id != dev_ids[idx]) { + if (ostatus == noErr && dev_id != dev_ids[idx]) { AudioDeviceID temp_id = dev_ids[idx]; for (i = idx + 1; i < dev_size; i++) { @@ -461,7 +463,7 @@ static pj_status_t ca_factory_refresh(pjmedia_aud_dev_factory *f) ostatus = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, NULL, &size, (void *)&dev_id); - if (ostatus != noErr && dev_id != dev_ids[idx]) { + if (ostatus == noErr && dev_id != dev_ids[idx]) { AudioDeviceID temp_id = dev_ids[idx]; for (i = idx + 1; i < dev_size; i++) { |