Changeset 21571 for trunk/src/dsound

Timestamp:

Feb 9, 2011, 5:03:14 PM (15 years ago)

Author:

dmik

Message:

dsound: Enumerate the default sound device twice in DirectSoundEnumerate() (according to MSDN).

Location:

trunk/src/dsound

Files:

• DSOUND.CPP (modified) (2 diffs)
• OS2DSOUND.H (modified) (1 diff)

trunk/src/dsound/DSOUND.CPP

@@ -106 +106 @@
    dprintf(("DSOUND:DirectSoundEnumerateA\n"));
 
-   lpCallback(NULL, "DART DirectSound for OS/2", "DirectSound/2 v0.5",
-              lpContext);
+   // According to MSDN, the default sound device comes twice: first with a
+   // null GUID and second wth its real GUID
+
+   lpCallback(NULL,
+              "DART DirectSound for OS/2", "DirectSound/2 v0.5",
+              lpContext);
+
+   lpCallback((LPGUID)&GUID_DirectSound_DART,
+              "DART DirectSound for OS/2", "DirectSound/2 v0.5",
+              lpContext);
+
    return DS_OK;
 }
@@ -118 +127 @@
    dprintf(("DSOUND:DirectSoundEnumerateW\n"));
 
-   lpCallback(NULL, (LPWSTR)L"DART DirectSound for OS/2", (LPWSTR)L"DirectSound/2 v0.5",
-              lpContext);
+   // According to MSDN, the default sound device comes twice: first with a
+   // null GUID and second wth its real GUID
+
+   lpCallback(NULL,
+              (LPWSTR)L"DART DirectSound for OS/2", (LPWSTR)L"DirectSound/2 v0.5",
+              lpContext);
+
+   lpCallback((LPGUID)&GUID_DirectSound_DART,
+              (LPWSTR)L"DART DirectSound for OS/2", (LPWSTR)L"DirectSound/2 v0.5",
+              lpContext);
+
    return DS_OK;
 }

trunk/src/dsound/OS2DSOUND.H

@@ -20 +20 @@
 // A forward declaration is need here!
 class OS2PrimBuff;
+
+// GUID for the only device we provide (DART DirectSound for OS/2)
+DEFINE_GUID(GUID_DirectSound_DART, 0x03BC8FA8, 0x3460, 0x11E0, 0x99, 0x51, 0x49, 0xC1, 0xDF, 0xD7, 0x20, 0x85 );
 
 class OS2IDirectSound