Permalink
Browse files

remove recording device and make the nodes run on HOST cpu

  • Loading branch information...
1 parent 5b0f314 commit 02f8ea0c80febb5a09e6f1bbc7b8f328c1f323cc @02strich committed Feb 19, 2012
Showing with 22 additions and 41 deletions.
  1. +6 −6 mintopo.cpp
  2. +1 −2 minwave.cpp
  3. +2 −10 msvad.inf
  4. +1 −1 simple.h
  5. +12 −22 toptable.h
View
@@ -36,8 +36,8 @@ Module Name:
PHYSICALCONNECTIONTABLE TopologyPhysicalConnections =
{
KSPIN_TOPO_WAVEOUT_SOURCE, // TopologyIn
- KSPIN_TOPO_WAVEIN_DEST, // TopologyOut
- KSPIN_WAVE_CAPTURE_SOURCE, // WaveIn
+ (ULONG)-1,
+ (ULONG)-1,
KSPIN_WAVE_RENDER_SOURCE // WaveOut
};
@@ -357,14 +357,14 @@ Return Value:
NTSTATUS ntStatus = STATUS_INVALID_DEVICE_REQUEST;
- if (PropertyRequest->Verb & KSPROPERTY_TYPE_GET) {
+ if (PropertyRequest->Verb & KSPROPERTY_TYPE_BASICSUPPORT) {
+ ntStatus = PropertyHandler_BasicSupport(PropertyRequest, KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_BASICSUPPORT, VT_ILLEGAL);
+ } else if (PropertyRequest->Verb & KSPROPERTY_TYPE_GET) {
ntStatus = ValidatePropertyParams(PropertyRequest, sizeof(ULONG));
if (NT_SUCCESS(ntStatus)) {
- *(PLONG(PropertyRequest->Value)) = KSAUDIO_CPU_RESOURCES_NOT_HOST_CPU;
+ *(PLONG(PropertyRequest->Value)) = KSAUDIO_CPU_RESOURCES_HOST_CPU;
PropertyRequest->ValueSize = sizeof(LONG);
}
- } else if (PropertyRequest->Verb & KSPROPERTY_TYPE_BASICSUPPORT) {
- ntStatus = PropertyHandler_BasicSupport(PropertyRequest, KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_BASICSUPPORT, VT_ILLEGAL);
}
return ntStatus;
View
@@ -586,9 +586,8 @@ Return Value:
} else if (PropertyRequest->Verb & KSPROPERTY_TYPE_GET) {
ntStatus = ValidatePropertyParams(PropertyRequest, sizeof(LONG), 0);
if (NT_SUCCESS(ntStatus)) {
- *(PLONG(PropertyRequest->Value)) = KSAUDIO_CPU_RESOURCES_NOT_HOST_CPU;
+ *(PLONG(PropertyRequest->Value)) = KSAUDIO_CPU_RESOURCES_HOST_CPU;
PropertyRequest->ValueSize = sizeof(LONG);
- ntStatus = STATUS_SUCCESS;
}
}
View
@@ -26,13 +26,9 @@ vadsimpl.sys=222
[MicrosoftDS]
%MSVAD_Simple.DeviceDesc%=MSVAD_Simple,*MSVADSimple
-;; This section enables installing on x64 systems
-
[MicrosoftDS.NTAMD64]
%MSVAD_Simple.DeviceDesc%=MSVAD_Simple,*MSVADSimple
-;; This section enables installing on Itanium systems
-
[MicrosoftDS.NTIA64]
%MSVAD_Simple.DeviceDesc%=MSVAD_Simple,*MSVADSimple
@@ -53,21 +49,18 @@ vadsimpl.sys
[MSVAD_Simple.Interfaces]
AddInterface=%KSCATEGORY_AUDIO%,%KSNAME_Wave%,MSVAD.I.Wave
AddInterface=%KSCATEGORY_RENDER%,%KSNAME_Wave%,MSVAD.I.Wave
-AddInterface=%KSCATEGORY_CAPTURE%,%KSNAME_Wave%,MSVAD.I.Wave
AddInterface=%KSCATEGORY_AUDIO%,%KSNAME_Topology%,MSVAD.I.Topo
[MSVAD_Simple.AddReg]
-HKR,,AssociatedFilters,,"wdmaud,swmidi,redbook"
+HKR,,AssociatedFilters,,"wdmaud,redbook"
HKR,,Driver,,vadsimpl.sys
-HKR,Drivers,SubClasses,,"wave,midi,mixer"
+HKR,Drivers,SubClasses,,"wave,mixer"
HKR,Drivers\wave\wdmaud.drv,Driver,,wdmaud.drv
-HKR,Drivers\midi\wdmaud.drv,Driver,,wdmaud.drv
HKR,Drivers\mixer\wdmaud.drv,Driver,,wdmaud.drv
HKR,Drivers\wave\wdmaud.drv,Description,,%MSVAD_Simple.DeviceDesc%
-HKR,Drivers\midi\wdmaud.drv,Description,,%MSVAD_MIDI%
HKR,Drivers\mixer\wdmaud.drv,Description,,%MSVAD_Simple.DeviceDesc%
HKLM,%MediaCategories%\%Simple.NameGuid%,Name,,%Simple.Name%
@@ -99,7 +92,6 @@ AddReg=MSVAD_Simple.AddReg
[MSVAD_Simple.NT.Interfaces]
AddInterface=%KSCATEGORY_AUDIO%,%KSNAME_Wave%,MSVAD.I.Wave
AddInterface=%KSCATEGORY_RENDER%,%KSNAME_Wave%,MSVAD.I.Wave
-AddInterface=%KSCATEGORY_CAPTURE%,%KSNAME_Wave%,MSVAD.I.Wave
AddInterface=%KSCATEGORY_AUDIO%,%KSNAME_Topology%,MSVAD.I.Topo
[MSVAD_Simple.NT.Services]
View
@@ -19,7 +19,7 @@ DEFINE_GUIDSTRUCT("946A7B1A-EBBC-422a-A81F-F07C8D40D3B4", NAME_MSVAD_SIMPLE);
#define NAME_MSVAD_SIMPLE DEFINE_GUIDNAMED(NAME_MSVAD_SIMPLE)
// Pin properties.
-#define MAX_OUTPUT_STREAMS 1 // Number of capture streams.
+#define MAX_OUTPUT_STREAMS 0 // Number of capture streams.
#define MAX_INPUT_STREAMS 1 // Number of render streams.
#define MAX_TOTAL_STREAMS MAX_OUTPUT_STREAMS + MAX_INPUT_STREAMS
View
@@ -159,16 +159,6 @@ static PCPIN_DESCRIPTOR MiniportPins[] = {
};
//=============================================================================
-static KSJACK_DESCRIPTION JackDescMic = {
- KSAUDIO_SPEAKER_STEREO,
- 0xE88C99, // HDAudio color spec for pink
- eConnType3Point5mm,
- eGeoLocRear,
- eGenLocPrimaryBox,
- ePortConnJack,
- TRUE
-};
-
static KSJACK_DESCRIPTION JackDescSpeakers = {
KSAUDIO_SPEAKER_STEREO,
0xB3C98C, // HDAudio color spec for green
@@ -183,7 +173,7 @@ static PKSJACK_DESCRIPTION JackDescriptions[] = {
NULL,
NULL,
NULL,
- &JackDescMic,
+ NULL,
&JackDescSpeakers,
NULL
};
@@ -373,27 +363,27 @@ C_ASSERT( KSNODE_TOPO_DEV_SPECIFIC_UINT == DEV_SPECIFIC_VT_UI4 );
//=============================================================================
static PCCONNECTION_DESCRIPTOR MiniportConnections[] = {
// FromNode, FromPin, ToNode, ToPin
- { PCFILTER_NODE, KSPIN_TOPO_WAVEOUT_SOURCE, KSNODE_TOPO_WAVEOUT_VOLUME, 1 },
- { KSNODE_TOPO_WAVEOUT_VOLUME, 0, KSNODE_TOPO_WAVEOUT_MUTE, 1 },
- { KSNODE_TOPO_WAVEOUT_MUTE, 0, KSNODE_TOPO_LINEOUT_MIX, 1 },
+ { PCFILTER_NODE, KSPIN_TOPO_WAVEOUT_SOURCE, KSNODE_TOPO_WAVEOUT_VOLUME, 1 },
+ { KSNODE_TOPO_WAVEOUT_VOLUME, 0, KSNODE_TOPO_WAVEOUT_MUTE, 1 },
+ { KSNODE_TOPO_WAVEOUT_MUTE, 0, KSNODE_TOPO_LINEOUT_MIX, 1 },
- { PCFILTER_NODE, KSPIN_TOPO_SYNTHOUT_SOURCE, KSNODE_TOPO_SYNTHOUT_VOLUME, 1 },
- { KSNODE_TOPO_SYNTHOUT_VOLUME, 0, KSNODE_TOPO_SYNTHOUT_MUTE, 1 },
- { KSNODE_TOPO_SYNTHOUT_MUTE, 0, KSNODE_TOPO_LINEOUT_MIX, 2 },
+ { PCFILTER_NODE, KSPIN_TOPO_SYNTHOUT_SOURCE, KSNODE_TOPO_SYNTHOUT_VOLUME, 1 },
+ { KSNODE_TOPO_SYNTHOUT_VOLUME, 0, KSNODE_TOPO_SYNTHOUT_MUTE, 1 },
+ { KSNODE_TOPO_SYNTHOUT_MUTE, 0, KSNODE_TOPO_LINEOUT_MIX, 2 },
- { PCFILTER_NODE, KSPIN_TOPO_SYNTHIN_SOURCE, KSNODE_TOPO_SYNTHIN_VOLUME, 1 },
- { KSNODE_TOPO_SYNTHIN_VOLUME, 0, KSNODE_TOPO_WAVEIN_MUX, 2 },
+ { PCFILTER_NODE, KSPIN_TOPO_SYNTHIN_SOURCE, KSNODE_TOPO_SYNTHIN_VOLUME, 1 },
+ { KSNODE_TOPO_SYNTHIN_VOLUME, 0, KSNODE_TOPO_WAVEIN_MUX, 2 },
- { PCFILTER_NODE, KSPIN_TOPO_MIC_SOURCE, KSNODE_TOPO_MIC_VOLUME, 1 },
- { KSNODE_TOPO_MIC_VOLUME, 0, KSNODE_TOPO_WAVEIN_MUX, 1 },
+ { PCFILTER_NODE, KSPIN_TOPO_MIC_SOURCE, KSNODE_TOPO_MIC_VOLUME, 1 },
+ { KSNODE_TOPO_MIC_VOLUME, 0, KSNODE_TOPO_WAVEIN_MUX, 1 },
{ KSNODE_TOPO_LINEOUT_MIX, 0, KSNODE_TOPO_DEV_SPECIFIC_BOOL, 1 },
{ KSNODE_TOPO_DEV_SPECIFIC_BOOL,0, KSNODE_TOPO_DEV_SPECIFIC_INT, 1 },
{ KSNODE_TOPO_DEV_SPECIFIC_INT, 0, KSNODE_TOPO_DEV_SPECIFIC_UINT, 1 },
{ KSNODE_TOPO_DEV_SPECIFIC_UINT,0, KSNODE_TOPO_LINEOUT_VOLUME, 1 },
{ KSNODE_TOPO_LINEOUT_VOLUME, 0, PCFILTER_NODE, KSPIN_TOPO_LINEOUT_DEST },
- { KSNODE_TOPO_WAVEIN_MUX, 0, PCFILTER_NODE, KSPIN_TOPO_WAVEIN_DEST }
+ { KSNODE_TOPO_WAVEIN_MUX, 0, PCFILTER_NODE, KSPIN_TOPO_WAVEIN_DEST }
};

0 comments on commit 02f8ea0

Please sign in to comment.