Changeset 4883 for pjproject

Timestamp:

Jul 28, 2014 1:43:22 AM (10 years ago)

Author:

ming

Message:

Re #1751 (misc): Fixed incorrect usage of dev_size (should be dev_count) in coreaudio device

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/coreaudio_dev.m (modified) (3 diffs)

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

@@ -434 +434 @@
 
     /* Get all the audio device IDs */
-    dev_ids = (AudioDeviceID *)pj_pool_calloc(cf->pool, dev_size, size);
+    dev_ids = (AudioDeviceID *)pj_pool_calloc(cf->pool, dev_count, size);
     if (!dev_ids)
         return PJ_ENOMEM;
-    pj_bzero(dev_ids, dev_count);
     ostatus = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr,
                                          0, NULL,
@@ -464 +463 @@
             AudioDeviceID temp_id = dev_ids[idx];
             
-            for (i = idx + 1; i < dev_size; i++) {
+            for (i = idx + 1; i < dev_count; i++) {
                 if (dev_ids[i] == dev_id) {
                     dev_ids[idx++] = dev_id;
@@ -481 +480 @@
             AudioDeviceID temp_id = dev_ids[idx];
             
-            for (i = idx + 1; i < dev_size; i++) {
+            for (i = idx + 1; i < dev_count; i++) {
                 if (dev_ids[i] == dev_id) {
                     dev_ids[idx] = dev_id;