Author: janderwald
Date: Tue Dec 7 17:46:25 2010
New Revision: 49975
URL:
http://svn.reactos.org/svn/reactos?rev=49975&view=rev
Log:
[AUDIO-BRINGUP]
- Silence traces
Modified:
branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c
branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c
branches/audio-bringup/lib/drivers/sound/mmixer/controls.c
branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c
Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c
URL:
http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.…
==============================================================================
--- branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original)
+++ branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Tue Dec 7 17:46:25
2010
@@ -293,7 +293,6 @@
HeapFree(GetProcessHeap(), 0, DetailData);
return MM_STATUS_NO_MEMORY;
}
- DPRINT1("DeviceName %S\n", DetailData->DevicePath);
wcscpy(*DeviceName, DetailData->DevicePath);
HeapFree(GetProcessHeap(), 0, DetailData);
Modified: branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c
URL:
http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.…
==============================================================================
--- branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original)
+++ branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Tue Dec 7 17:46:25
2010
@@ -44,7 +44,7 @@
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 )
@@ -112,7 +112,7 @@
case DRV_LOAD :
{
MMRESULT Result;
- SND_TRACE(L"DRV_LOAD\n");
+ //SND_TRACE(L"DRV_LOAD\n");
Result = InitEntrypointMutexes();
@@ -130,7 +130,7 @@
}
/* 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_IN_DEVICE_TYPE);
PopulateWdmDeviceList(MIDI_OUT_DEVICE_TYPE);
@@ -138,7 +138,7 @@
PopulateWdmDeviceList(AUX_DEVICE_TYPE);
PopulateWdmDeviceList(MIXER_DEVICE_TYPE);
- SND_TRACE(L"Initialisation complete\n");
+ //SND_TRACE(L"Initialisation complete\n");
return 1L;
}
@@ -163,14 +163,14 @@
case DRV_ENABLE :
case DRV_DISABLE :
{
- SND_TRACE(L"DRV_ENABLE / DRV_DISABLE\n");
+ //SND_TRACE(L"DRV_ENABLE / DRV_DISABLE\n");
return 1L;
}
case DRV_OPEN :
case DRV_CLOSE :
{
- SND_TRACE(L"DRV_OPEN / DRV_CLOSE\n");
+ //SND_TRACE(L"DRV_OPEN / DRV_CLOSE\n");
return 1L;
}
Modified: branches/audio-bringup/lib/drivers/sound/mmixer/controls.c
URL:
http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound…
==============================================================================
--- branches/audio-bringup/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original)
+++ branches/audio-bringup/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Tue Dec 7
17:46:25 2010
@@ -1056,9 +1056,9 @@
AllPinsCount = 0;
MMixerGetAllUpOrDownstreamPinsFromNodeIndex(MixerContext, Topology, LineTerminator,
TRUE, &AllPinsCount, AllPins);
- DPRINT1("LineTerminator %lu\n", LineTerminator);
- DPRINT1("PinCount %lu\n", AllPinsCount);
- DPRINT1("AllNodesCount %lu\n", AllNodesCount);
+ DPRINT("LineTerminator %lu\n", LineTerminator);
+ DPRINT("PinCount %lu\n", AllPinsCount);
+ DPRINT("AllNodesCount %lu\n", AllNodesCount);
/* now construct the source lines which are attached to the destination line */
Index = AllPinsCount;
@@ -1268,7 +1268,7 @@
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 */
ASSERT(MixerData->MixerInfo == NULL || MixerData->MixerInfo == MixerInfo);
@@ -1551,7 +1551,7 @@
ULONG DestinationLineID, LineTerminator;
LPMIXERLINE_EXT DstLine;
- DPRINT1("DeviceName %S\n", MixerData->DeviceName);
+ DPRINT("DeviceName %S\n", MixerData->DeviceName);
/* get topology pin count */
MMixerGetTopologyPinCount(Topology, &PinCount);
Modified: branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c
URL:
http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound…
==============================================================================
--- branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] (original)
+++ branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] Tue Dec 7
17:46:25 2010
@@ -146,16 +146,15 @@
}
if (MixerLine->cbStruct != sizeof(MIXERLINEW))
- {
- DPRINT1("MixerLine Expected %lu but got %lu\n", sizeof(MIXERLINEW),
MixerLine->cbStruct);
- return MM_STATUS_INVALID_PARAMETER;
- }
-
+ {
+ DPRINT1("MixerLine Expected %lu but got %lu\n", sizeof(MIXERLINEW),
MixerLine->cbStruct);
+ return MM_STATUS_INVALID_PARAMETER;
+ }
/* clear hmixer from flags */
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)
{
@@ -511,7 +510,7 @@
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)
{
case MIXERCONTROL_CONTROLTYPE_MUTE: