Changeset 1454

Timestamp:

02/16/10 06:18:52 (5 months ago)

Author:

dmitrykos

Message:

provided ability not to depend on ksguid.lib when using WDMKS as it may not be provided for x64 SDK by default, define PA_WDMKS_NO_KSGUID_LIB to use static declarations, x64 MSVC project corrected to define PA_WDMKS_NO_KSGUID_LIB for x64 compilations. added WASAPI symbols to portaudio.def.

Location:

portaudio/trunk

Files:

• build/msvc/portaudio.def (modified) (1 diff)
• build/msvc/portaudio.vcproj (modified) (12 diffs)
• src/os/win/pa_win_wdmks_utils.c (modified) (6 diffs)

portaudio/trunk/build/msvc/portaudio.def

@@ -42 +42 @@
 PaAsio_GetOutputChannelName         @54
 PaUtil_SetDebugPrintFunction        @55
+PaWasapi_GetDeviceDefaultFormat     @56
+PaWasapi_GetDeviceRole              @57
+PaWasapi_ThreadPriorityBoost        @58
+PaWasapi_ThreadPriorityRevert       @59

portaudio/trunk/build/msvc/portaudio.vcproj

@@ -2 +2 @@
 <VisualStudioProject
         ProjectType="Visual C++"
-        Version="8.00"
+        Version="8,00"
         Name="portaudio"
         ProjectGUID="{0A18A071-125E-442F-AFF7-A3F68ABECF99}"
+        RootNamespace="portaudio"
         >
         <Platforms>
@@ -51 +52 @@
                                 Optimization="2"
                                 InlineFunctionExpansion="1"
-                                AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
+                                EnableIntrinsicFunctions="true"
+                                FavorSizeOrSpeed="1"
+                                AdditionalIncludeDirectories="..\..\src\common;..\..\include;.\;..\..\src\os\win"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO"
                                 StringPooling="true"
@@ -80 +83 @@
                                 LinkIncremental="1"
                                 SuppressStartupBanner="true"
+                                AdditionalLibraryDirectories=""
                                 ModuleDefinitionFile=".\portaudio.def"
                                 ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.pdb"
@@ -146 +150 @@
                                 Optimization="2"
                                 InlineFunctionExpansion="1"
-                                AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO"
+                                EnableIntrinsicFunctions="true"
+                                FavorSizeOrSpeed="1"
+                                AdditionalIncludeDirectories="..\..\src\common;..\..\include;.\;..\..\src\os\win"
+                                PreprocessorDefinitions="_WIN64;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_WDMKS_NO_KSGUID_LIB"
                                 StringPooling="true"
                                 RuntimeLibrary="2"
@@ -175 +181 @@
                                 LinkIncremental="1"
                                 SuppressStartupBanner="true"
+                                AdditionalLibraryDirectories=""
                                 ModuleDefinitionFile=".\portaudio.def"
                                 ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb"
@@ -240 +247 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
+                                AdditionalIncludeDirectories="..\..\src\common;..\..\include;.\;..\..\src\os\win"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO"
                                 MinimalRebuild="true"
@@ -337 +344 @@
                                 Optimization="0"
                                 AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO"
+                                PreprocessorDefinitions="_WIN64;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_WDMKS_NO_KSGUID_LIB"
                                 MinimalRebuild="true"
                                 BasicRuntimeChecks="3"
@@ -720 +727 @@
                                                 />
                                         </FileConfiguration>
-
                                         <FileConfiguration
                                                 Name="Debug|x64"
@@ -946 +952 @@
                                                         <FileConfiguration
                                                                 Name="Release|Win32"
+                                                                ExcludedFromBuild="true"
                                                                 >
                                                                 <Tool
@@ -955 +962 @@
                                                         <FileConfiguration
                                                                 Name="Release|x64"
+                                                                ExcludedFromBuild="true"
                                                                 >
                                                                 <Tool
@@ -964 +972 @@
                                                         <FileConfiguration
                                                                 Name="Debug|Win32"
+                                                                ExcludedFromBuild="true"
                                                                 >
                                                                 <Tool
@@ -973 +982 @@
                                                         <FileConfiguration
                                                                 Name="Debug|x64"
+                                                                ExcludedFromBuild="true"
                                                                 >
                                                                 <Tool

portaudio/trunk/src/os/win/pa_win_wdmks_utils.c

@@ -46 +46 @@
 #include "pa_win_wdmks_utils.h"
 
+
+#ifndef PA_WDMKS_NO_KSGUID_LIB
+
 #if (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */
 #pragma comment( lib, "ksguid.lib" )
 #endif
+
+#define pa_KSDATAFORMAT_TYPE_AUDIO            KSDATAFORMAT_TYPE_AUDIO
+#define pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT    KSDATAFORMAT_SUBTYPE_IEEE_FLOAT
+#define pa_KSDATAFORMAT_SUBTYPE_PCM           KSDATAFORMAT_SUBTYPE_PCM
+#define pa_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX  KSDATAFORMAT_SUBTYPE_WAVEFORMATEX
+#define pa_KSMEDIUMSETID_Standard             KSMEDIUMSETID_Standard
+#define pa_KSINTERFACESETID_Standard          KSINTERFACESETID_Standard
+#define pa_KSPROPSETID_Pin                    KSPROPSETID_Pin
+
+#else
+
+static const GUID pa_KSDATAFORMAT_TYPE_AUDIO            = { STATIC_KSDATAFORMAT_TYPE_AUDIO };
+static const GUID pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT    = { STATIC_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT };
+static const GUID pa_KSDATAFORMAT_SUBTYPE_PCM           = { STATIC_KSDATAFORMAT_SUBTYPE_PCM };
+static const GUID pa_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX  = { STATIC_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX };
+static const GUID pa_KSMEDIUMSETID_Standard             = { STATIC_KSMEDIUMSETID_Standard };
+static const GUID pa_KSINTERFACESETID_Standard          = { STATIC_KSINTERFACESETID_Standard };
+static const GUID pa_KSPROPSETID_Pin                    = { STATIC_KSPROPSETID_Pin };
+
+#endif
+
+
+#define pa_IS_VALID_WAVEFORMATEX_GUID(Guid)\
+    (!memcmp(((PUSHORT)&pa_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX) + 1, ((PUSHORT)(Guid)) + 1, sizeof(GUID) - sizeof(USHORT)))
+
+
 
 static PaError WdmGetPinPropertySimple(
@@ -59 +88 @@
     DWORD bytesReturned;
     KSP_PIN ksPProp;
-    ksPProp.Property.Set = KSPROPSETID_Pin;
+    ksPProp.Property.Set = pa_KSPROPSETID_Pin;
     ksPProp.Property.Id = property;
     ksPProp.Property.Flags = KSPROPERTY_TYPE_GET;
@@ -89 +118 @@
     *ksMultipleItem = 0;
 
-    ksPProp.Property.Set = KSPROPSETID_Pin;
+    ksPProp.Property.Set = pa_KSPROPSETID_Pin;
     ksPProp.Property.Id = property;
     ksPProp.Property.Flags = KSPROPERTY_TYPE_GET;
@@ -189 +218 @@
 {
     HANDLE deviceHandle;
-    int pinCount, pinId, i;
+        ULONG i;
+    int pinCount, pinId;
     int result = 0;
     KSPIN_DATAFLOW requiredDataflowDirection = (isInput ? KSPIN_DATAFLOW_OUT : KSPIN_DATAFLOW_IN );
@@ -209 +239 @@
                  ( communication == KSPIN_COMMUNICATION_BOTH)) 
              && ( KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId, 
-                    KSPROPERTY_PIN_INTERFACES, &KSINTERFACESETID_Standard, KSINTERFACE_STANDARD_STREAMING )
+                    KSPROPERTY_PIN_INTERFACES, &pa_KSINTERFACESETID_Standard, KSINTERFACE_STANDARD_STREAMING )
                 || KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId, 
-                    KSPROPERTY_PIN_INTERFACES, &KSINTERFACESETID_Standard, KSINTERFACE_STANDARD_LOOPED_STREAMING ) )
+                    KSPROPERTY_PIN_INTERFACES, &pa_KSINTERFACESETID_Standard, KSINTERFACE_STANDARD_LOOPED_STREAMING ) )
              && KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId, 
-                    KSPROPERTY_PIN_MEDIUMS, &KSMEDIUMSETID_Standard, KSMEDIUM_STANDARD_DEVIO ) )
+                    KSPROPERTY_PIN_MEDIUMS, &pa_KSMEDIUMSETID_Standard, KSMEDIUM_STANDARD_DEVIO ) )
          {
             KSMULTIPLE_ITEM* item = NULL;
@@ -222 +252 @@
                 for( i=0; i < item->Count; ++i ){
 
-                    if( IS_VALID_WAVEFORMATEX_GUID(&dataRange->SubFormat)
-                            || memcmp( (void*)&dataRange->SubFormat, (void*)&KSDATAFORMAT_SUBTYPE_PCM, sizeof(GUID) ) == 0
-                            || memcmp( (void*)&dataRange->SubFormat, (void*)&KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, sizeof(GUID) ) == 0
-                            || ( ( memcmp( (void*)&dataRange->MajorFormat, (void*)&KSDATAFORMAT_TYPE_AUDIO, sizeof(GUID) ) == 0 )
+                    if( pa_IS_VALID_WAVEFORMATEX_GUID(&dataRange->SubFormat)
+                            || memcmp( (void*)&dataRange->SubFormat, (void*)&pa_KSDATAFORMAT_SUBTYPE_PCM, sizeof(GUID) ) == 0
+                            || memcmp( (void*)&dataRange->SubFormat, (void*)&pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, sizeof(GUID) ) == 0
+                            || ( ( memcmp( (void*)&dataRange->MajorFormat, (void*)&pa_KSDATAFORMAT_TYPE_AUDIO, sizeof(GUID) ) == 0 )
                                 && ( memcmp( (void*)&dataRange->SubFormat, (void*)&KSDATAFORMAT_SUBTYPE_WILDCARD, sizeof(GUID) ) == 0 ) ) )
                     {