From: Johannes Anderwald Date: Tue, 7 Dec 2010 17:46:25 +0000 (+0000) Subject: [AUDIO-BRINGUP] X-Git-Tag: backups/ros-branch-0_3_13@51035~84^2~22 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=2b777abf962cf7e8767af279380228f13f2a0d4d [AUDIO-BRINGUP] - Silence traces svn path=/branches/audio-bringup/; revision=49975 --- diff --git a/dll/win32/wdmaud.drv/mmixer.c b/dll/win32/wdmaud.drv/mmixer.c index 54457c4ea68..1e4043b2821 100644 --- a/dll/win32/wdmaud.drv/mmixer.c +++ b/dll/win32/wdmaud.drv/mmixer.c @@ -293,7 +293,6 @@ Enum( HeapFree(GetProcessHeap(), 0, DetailData); return MM_STATUS_NO_MEMORY; } - DPRINT1("DeviceName %S\n", DetailData->DevicePath); wcscpy(*DeviceName, DetailData->DevicePath); HeapFree(GetProcessHeap(), 0, DetailData); diff --git a/dll/win32/wdmaud.drv/wdmaud.c b/dll/win32/wdmaud.drv/wdmaud.c index 820c77f21c1..73b9f7ee7b2 100644 --- a/dll/win32/wdmaud.drv/wdmaud.c +++ b/dll/win32/wdmaud.drv/wdmaud.c @@ -44,7 +44,7 @@ PopulateWdmDeviceList( 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 @@ DriverProc( case DRV_LOAD : { MMRESULT Result; - SND_TRACE(L"DRV_LOAD\n"); + //SND_TRACE(L"DRV_LOAD\n"); Result = InitEntrypointMutexes(); @@ -130,7 +130,7 @@ DriverProc( } /* 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 @@ DriverProc( 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 @@ DriverProc( 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; } diff --git a/lib/drivers/sound/mmixer/controls.c b/lib/drivers/sound/mmixer/controls.c index 15e3216e9c8..6d57bd7f0d3 100644 --- a/lib/drivers/sound/mmixer/controls.c +++ b/lib/drivers/sound/mmixer/controls.c @@ -1056,9 +1056,9 @@ MMixerAddMixerSourceLines( 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 @@ MMixerHandlePhysicalConnection( 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 @@ MMixerHandleAlternativeMixers( 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); diff --git a/lib/drivers/sound/mmixer/mixer.c b/lib/drivers/sound/mmixer/mixer.c index a473fdae768..5a8e666026b 100644 --- a/lib/drivers/sound/mmixer/mixer.c +++ b/lib/drivers/sound/mmixer/mixer.c @@ -146,16 +146,15 @@ MMixerGetLineInfo( } 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 @@ MMixerSetControlDetails( 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: