Changeset 1422

Timestamp:

Aug 22, 2007 12:34:48 PM (17 years ago)

Author:

bennylp

Message:

Fixed bug in dsound.c: handled case when lpGUID is NULL (common for primary devices). Thanks Yejun Yang

File:

• pjproject/trunk/pjmedia/src/pjmedia/dsound.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia/dsound.c

@@ -52 +52 @@
 {
     pjmedia_snd_dev_info    info;
+    LPGUID                  lpGuid;
     GUID                    guid;
 };
@@ -159 +160 @@
      * Create DirectSound device.
      */
-    hr = DirectSoundCreate(&dev_info[dev_id].guid, &ds_strm->ds.play.lpDs, 
+    hr = DirectSoundCreate(dev_info[dev_id].lpGuid, &ds_strm->ds.play.lpDs, 
                            NULL);
     if (FAILED(hr))
@@ -278 +279 @@
      * Creating recorder device.
      */
-    hr = DirectSoundCaptureCreate(&dev_info[dev_id].guid, 
+    hr = DirectSoundCaptureCreate(dev_info[dev_id].lpGuid, 
                                   &ds_strm->ds.capture.lpDs, NULL);
     if (FAILED(hr))
@@ -602 +603 @@
      */
     for (index=0; index<dev_count; ++index) {
-        if (pj_memcmp(&dev_info[index].guid, lpGuid, sizeof(GUID))==0)
+        if ((dev_info[index].lpGuid==NULL && lpGuid==NULL) ||
+            pj_memcmp(&dev_info[index].guid, lpGuid, sizeof(GUID))==0)
+        {
             break;
+        }
     }
 
@@ -617 +621 @@
     strncpy(dev_info[index].info.name, lpcstrDescription, max);
     dev_info[index].info.name[max-1] = '\0';
-    pj_memcpy(&dev_info[index].guid, lpGuid, sizeof(GUID));
+    if (lpGuid == NULL) {
+        dev_info[index].lpGuid = NULL;
+    } else {
+        pj_memcpy(&dev_info[index].guid, lpGuid, sizeof(GUID));
+        dev_info[index].lpGuid = &dev_info[index].guid;
+    }
     dev_info[index].info.default_samples_per_sec = 44100;