Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 18:45:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[AUDIO-BRINGUP]

Browse source 
- Silence traces

svn path=/branches/audio-bringup/; revision=49975
This commit is contained in:
Johannes Anderwald 2010-12-07 17:46:25 +00:00
parent 4cf9ead133
commit 2b777abf96
4 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dll/win32/wdmaud.drv/mmixer.c
View file

@ -293,7 +293,6 @@ Enum(
HeapFree(GetProcessHeap(), 0, DetailData); HeapFree(GetProcessHeap(), 0, DetailData);
return MM_STATUS_NO_MEMORY; return MM_STATUS_NO_MEMORY;
} }
DPRINT1("DeviceName %S\n", DetailData->DevicePath);
wcscpy(*DeviceName, DetailData->DevicePath); wcscpy(*DeviceName, DetailData->DevicePath);
HeapFree(GetProcessHeap(), 0, DetailData); HeapFree(GetProcessHeap(), 0, DetailData);

12
dll/win32/wdmaud.drv/wdmaud.c
View file

@ -44,7 +44,7 @@ PopulateWdmDeviceList(
return TranslateInternalMmResult(Result); return TranslateInternalMmResult(Result);
} }
SND_TRACE(L"%d devices of type %d found\n", DeviceCount, DeviceType); //SND_TRACE(L"%d devices of type %d found\n", DeviceCount, DeviceType);
for ( i = 0; i < DeviceCount; ++ i ) for ( i = 0; i < DeviceCount; ++ i )
@ -112,7 +112,7 @@ DriverProc(
case DRV_LOAD : case DRV_LOAD :
{ {
MMRESULT Result; MMRESULT Result;
SND_TRACE(L"DRV_LOAD\n"); //SND_TRACE(L"DRV_LOAD\n");
Result = InitEntrypointMutexes(); Result = InitEntrypointMutexes();
@ -130,7 +130,7 @@ DriverProc(
} }
/* Populate the device lists */ /* Populate the device lists */
SND_TRACE(L"Populating device lists\n"); //SND_TRACE(L"Populating device lists\n");
PopulateWdmDeviceList(WAVE_OUT_DEVICE_TYPE); PopulateWdmDeviceList(WAVE_OUT_DEVICE_TYPE);
PopulateWdmDeviceList(WAVE_IN_DEVICE_TYPE); PopulateWdmDeviceList(WAVE_IN_DEVICE_TYPE);
PopulateWdmDeviceList(MIDI_OUT_DEVICE_TYPE); PopulateWdmDeviceList(MIDI_OUT_DEVICE_TYPE);
@ -138,7 +138,7 @@ DriverProc(
PopulateWdmDeviceList(AUX_DEVICE_TYPE); PopulateWdmDeviceList(AUX_DEVICE_TYPE);
PopulateWdmDeviceList(MIXER_DEVICE_TYPE); PopulateWdmDeviceList(MIXER_DEVICE_TYPE);
SND_TRACE(L"Initialisation complete\n"); //SND_TRACE(L"Initialisation complete\n");
return 1L; return 1L;
} }
@ -163,14 +163,14 @@ DriverProc(
case DRV_ENABLE : case DRV_ENABLE :
case DRV_DISABLE : case DRV_DISABLE :
{ {
SND_TRACE(L"DRV_ENABLE / DRV_DISABLE\n"); //SND_TRACE(L"DRV_ENABLE / DRV_DISABLE\n");
return 1L; return 1L;
} }
case DRV_OPEN : case DRV_OPEN :
case DRV_CLOSE : case DRV_CLOSE :
{ {
SND_TRACE(L"DRV_OPEN / DRV_CLOSE\n"); //SND_TRACE(L"DRV_OPEN / DRV_CLOSE\n");
return 1L; return 1L;
} }

10
lib/drivers/sound/mmixer/controls.c
View file

@ -1056,9 +1056,9 @@ MMixerAddMixerSourceLines(
AllPinsCount = 0; AllPinsCount = 0;
MMixerGetAllUpOrDownstreamPinsFromNodeIndex(MixerContext, Topology, LineTerminator, TRUE, &AllPinsCount, AllPins); MMixerGetAllUpOrDownstreamPinsFromNodeIndex(MixerContext, Topology, LineTerminator, TRUE, &AllPinsCount, AllPins);
DPRINT1("LineTerminator %lu\n", LineTerminator); DPRINT("LineTerminator %lu\n", LineTerminator);
DPRINT1("PinCount %lu\n", AllPinsCount); DPRINT("PinCount %lu\n", AllPinsCount);
DPRINT1("AllNodesCount %lu\n", AllNodesCount); DPRINT("AllNodesCount %lu\n", AllNodesCount);
/* now construct the source lines which are attached to the destination line */ /* now construct the source lines which are attached to the destination line */
Index = AllPinsCount; Index = AllPinsCount;
@ -1268,7 +1268,7 @@ MMixerHandlePhysicalConnection(
return MM_STATUS_UNSUCCESSFUL; return MM_STATUS_UNSUCCESSFUL;
} }
DPRINT1("Name %S, Pin %lu bInput %lu\n", OutConnection->SymbolicLinkName, OutConnection->Pin, bInput); DPRINT("Name %S, Pin %lu bInput %lu\n", OutConnection->SymbolicLinkName, OutConnection->Pin, bInput);
/* sanity check */ /* sanity check */
ASSERT(MixerData->MixerInfo == NULL || MixerData->MixerInfo == MixerInfo); ASSERT(MixerData->MixerInfo == NULL || MixerData->MixerInfo == MixerInfo);
@ -1551,7 +1551,7 @@ MMixerHandleAlternativeMixers(
ULONG DestinationLineID, LineTerminator; ULONG DestinationLineID, LineTerminator;
LPMIXERLINE_EXT DstLine; LPMIXERLINE_EXT DstLine;
DPRINT1("DeviceName %S\n", MixerData->DeviceName); DPRINT("DeviceName %S\n", MixerData->DeviceName);
/* get topology pin count */ /* get topology pin count */
MMixerGetTopologyPinCount(Topology, &PinCount); MMixerGetTopologyPinCount(Topology, &PinCount);

13
lib/drivers/sound/mmixer/mixer.c
View file

@ -146,16 +146,15 @@ MMixerGetLineInfo(
} }
if (MixerLine->cbStruct != sizeof(MIXERLINEW)) if (MixerLine->cbStruct != sizeof(MIXERLINEW))
{ {
DPRINT1("MixerLine Expected %lu but got %lu\n", sizeof(MIXERLINEW), MixerLine->cbStruct); DPRINT1("MixerLine Expected %lu but got %lu\n", sizeof(MIXERLINEW), MixerLine->cbStruct);
return MM_STATUS_INVALID_PARAMETER; return MM_STATUS_INVALID_PARAMETER;
} }
/* clear hmixer from flags */ /* clear hmixer from flags */
Flags &=~MIXER_OBJECTF_HMIXER; Flags &=~MIXER_OBJECTF_HMIXER;
DPRINT1("MMixerGetLineInfo MixerId %lu Flags %lu\n", MixerId, Flags); DPRINT("MMixerGetLineInfo MixerId %lu Flags %lu\n", MixerId, Flags);
if (Flags == MIXER_GETLINEINFOF_DESTINATION) if (Flags == MIXER_GETLINEINFOF_DESTINATION)
{ {
@ -511,7 +510,7 @@ MMixerSetControlDetails(
return MM_STATUS_INVALID_PARAMETER; return MM_STATUS_INVALID_PARAMETER;
} }
DPRINT1("MMixerSetControlDetails ControlType %lx MixerControlName %S MixerLineName %S NodeID %lu\n", MixerControl->Control.dwControlType, MixerControl->Control.szName, MixerLine->Line.szName, NodeId); DPRINT("MMixerSetControlDetails ControlType %lx MixerControlName %S MixerLineName %S NodeID %lu\n", MixerControl->Control.dwControlType, MixerControl->Control.szName, MixerLine->Line.szName, NodeId);
switch(MixerControl->Control.dwControlType) switch(MixerControl->Control.dwControlType)
{ {
case MIXERCONTROL_CONTROLTYPE_MUTE: case MIXERCONTROL_CONTROLTYPE_MUTE: