Changeset 1638

Timestamp:

Dec 27, 2007 7:18:35 AM (16 years ago)

Author:

bennylp

Message:

Handle the case when PortAudio? returns negative sound device count in pasound.c

File:

• pjproject/trunk/pjmedia/src/pjmedia/pasound.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/pasound.c

@@ -236 +236 @@
 PJ_DEF(int) pjmedia_snd_get_dev_count(void)
 {
-    return Pa_GetDeviceCount();
+    int count = Pa_GetDeviceCount();
+    return count < 0 ? 0 : count;
 }
 
@@ -307 +308 @@
 
     /* If still no device is found, enumerate all devices */
-    count = Pa_GetDeviceCount();
+    count = pjmedia_snd_get_dev_count();
     for (i=0; i<count; ++i) {
         const PaDeviceInfo *paDevInfo;
@@ -363 +364 @@
 
     /* If still no device is found, enumerate all devices */
-    count = Pa_GetDeviceCount();
+    count = pjmedia_snd_get_dev_count();
     for (i=0; i<count; ++i) {
         const PaDeviceInfo *paDevInfo;
@@ -526 +527 @@
     stream->pool = pool;
     pj_strdup2_with_null(pool, &stream->name, paDevInfo->name);
-    stream->dir = stream->dir = PJMEDIA_DIR_PLAYBACK;
+    stream->dir = PJMEDIA_DIR_PLAYBACK;
     stream->play_id = index;
     stream->rec_id = -1;