Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BDASUP][KMIXER][MMIXER][STREAM] Replace meaningless YDEBUG (#5818)

Browse source 
bdasup: Addendum to 40c15ec (r46632).
kmixer: Addendum to 3e489bf (r42143).
mmixer: Addendum to c42d9f2 (r44872).
stream: Addendum to 4a0debf (r41662).
Serge plans a follow up that will remove all other remaining YDEBUG in the source tree.
The ones covered here he considered to be the most trivial ones.
This commit is contained in:
Serge Gautherie 2023-10-31 13:04:24 +01:00 committed by GitHub
parent 6d7aaaade0
commit 60b0afc3af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 12 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/multimedia/bdasup/precomp.h
View file

@ -10,7 +10,7 @@
#include <bdamedia.h> #include <bdamedia.h>
#include <bdasup.h> #include <bdasup.h>
#define YDEBUG // #define NDEBUG
#include <debug.h> #include <debug.h>

3
drivers/wdm/audio/filters/kmixer/filter.c
View file

@ -10,7 +10,7 @@
#include <swenum.h> #include <swenum.h>
#define YDEBUG // #define NDEBUG
#include <debug.h> #include <debug.h>
NTSTATUS NTSTATUS
@ -199,4 +199,3 @@ KMixAllocateDeviceHeader(
CreateItem); CreateItem);
return Status; return Status;
} }

4
drivers/wdm/audio/filters/kmixer/kmixer.c
View file

@ -8,7 +8,7 @@
#include "kmixer.h" #include "kmixer.h"
#define YDEBUG // #define NDEBUG
#include <debug.h> #include <debug.h>
NTSTATUS NTSTATUS
@ -72,7 +72,6 @@ KMix_AddDevice(
/* initialize device extension */ /* initialize device extension */
RtlZeroMemory(DeviceExtension, sizeof(KMIXER_DEVICE_EXT)); RtlZeroMemory(DeviceExtension, sizeof(KMIXER_DEVICE_EXT));
Status = KMixAllocateDeviceHeader(DeviceExtension); Status = KMixAllocateDeviceHeader(DeviceExtension);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
@ -98,7 +97,6 @@ cleanup:
return Status; return Status;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
DriverEntry( DriverEntry(

3
drivers/wdm/audio/legacy/stream/stream.h
View file

@ -1,7 +1,8 @@
#pragma once #pragma once
#include <strmini.h> #include <strmini.h>
#define YDEBUG
// #define NDEBUG
#include <debug.h> #include <debug.h>
#define STREAMDEBUG_LEVEL DebugLevelMaximum #define STREAMDEBUG_LEVEL DebugLevelMaximum

9
sdk/lib/drivers/sound/mmixer/controls.c
View file

@ -8,7 +8,7 @@
#include "precomp.h" #include "precomp.h"
#define YDEBUG // #define NDEBUG
#include <debug.h> #include <debug.h>
const GUID KSNODETYPE_DESKTOP_MICROPHONE = {0xDFF21BE2, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; const GUID KSNODETYPE_DESKTOP_MICROPHONE = {0xDFF21BE2, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}};
@ -56,7 +56,6 @@ MMixerAddMixerControl(
return MM_STATUS_NO_MEMORY; return MM_STATUS_NO_MEMORY;
} }
/* initialize mixer control */ /* initialize mixer control */
MixerControl->hDevice = hMixer; MixerControl->hDevice = hMixer;
MixerControl->NodeID = NodeIndex; MixerControl->NodeID = NodeIndex;
@ -263,7 +262,6 @@ MMixerCreateDestinationLine(
DestinationLine->Line.dwUser = 0; DestinationLine->Line.dwUser = 0;
DestinationLine->Line.fdwLine = MIXERLINE_LINEF_ACTIVE; DestinationLine->Line.fdwLine = MIXERLINE_LINEF_ACTIVE;
if (LineName) if (LineName)
{ {
MixerContext->Copy(DestinationLine->Line.szShortName, LineName, (min(MIXER_SHORT_NAME_CHARS, wcslen(LineName)+1)) * sizeof(WCHAR)); MixerContext->Copy(DestinationLine->Line.szShortName, LineName, (min(MIXER_SHORT_NAME_CHARS, wcslen(LineName)+1)) * sizeof(WCHAR));
@ -564,7 +562,6 @@ MMixerGetChannelCountEnhanced(
Request.Property.Flags = KSPROPERTY_TYPE_BASICSUPPORT | KSPROPERTY_TYPE_TOPOLOGY; Request.Property.Flags = KSPROPERTY_TYPE_BASICSUPPORT | KSPROPERTY_TYPE_TOPOLOGY;
Request.Property.Id = KSPROPERTY_AUDIO_VOLUMELEVEL; Request.Property.Id = KSPROPERTY_AUDIO_VOLUMELEVEL;
/* get description */ /* get description */
Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_NODE), (PVOID)&Description, sizeof(KSPROPERTY_DESCRIPTION), &BytesReturned); Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_NODE), (PVOID)&Description, sizeof(KSPROPERTY_DESCRIPTION), &BytesReturned);
if (Status == MM_STATUS_SUCCESS) if (Status == MM_STATUS_SUCCESS)
@ -772,7 +769,6 @@ MMixerGetComponentAndTargetType(
Request.Property.Set = KSPROPSETID_Pin; Request.Property.Set = KSPROPSETID_Pin;
Request.Property.Id = KSPROPERTY_PIN_CATEGORY; Request.Property.Id = KSPROPERTY_PIN_CATEGORY;
/* get pin category */ /* get pin category */
Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_PIN), &Guid, sizeof(GUID), &BytesReturned); Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_PIN), &Guid, sizeof(GUID), &BytesReturned);
if (Status != MM_STATUS_SUCCESS) if (Status != MM_STATUS_SUCCESS)
@ -1163,7 +1159,6 @@ MMixerAddMixerSourceLines(
return MM_STATUS_SUCCESS; return MM_STATUS_SUCCESS;
} }
MIXER_STATUS MIXER_STATUS
MMixerAddMixerControlsToDestinationLine( MMixerAddMixerControlsToDestinationLine(
IN PMIXER_CONTEXT MixerContext, IN PMIXER_CONTEXT MixerContext,
@ -1623,7 +1618,6 @@ MMixerInitializeFilter(
} }
} }
/* now get the bridge pin which is at the end of node path /* now get the bridge pin which is at the end of node path
* For sink pins (wave out) search down stream * For sink pins (wave out) search down stream
* For source pins (wave in) search up stream * For source pins (wave in) search up stream
@ -1829,7 +1823,6 @@ MMixerSetupFilter(
return Status; return Status;
} }
MIXER_STATUS MIXER_STATUS
MMixerAddEvent( MMixerAddEvent(
IN PMIXER_CONTEXT MixerContext, IN PMIXER_CONTEXT MixerContext,

2
sdk/lib/drivers/sound/mmixer/filter.c
View file

@ -8,7 +8,7 @@
#include "precomp.h" #include "precomp.h"
#define YDEBUG // #define NDEBUG
#include <debug.h> #include <debug.h>
ULONG ULONG

2
sdk/lib/drivers/sound/mmixer/midi.c
View file

@ -8,7 +8,7 @@
#include "precomp.h" #include "precomp.h"
#define YDEBUG // #define NDEBUG
#include <debug.h> #include <debug.h>
MIXER_STATUS MIXER_STATUS

4
sdk/lib/drivers/sound/mmixer/mixer.c
View file

@ -8,7 +8,7 @@
#include "precomp.h" #include "precomp.h"
#define YDEBUG // #define NDEBUG
#include <debug.h> #include <debug.h>
ULONG ULONG
@ -106,7 +106,6 @@ MMixerOpen(
/* add the event */ /* add the event */
Status = MMixerAddEvent(MixerContext, MixerInfo, MixerEventContext, MixerEventRoutine); Status = MMixerAddEvent(MixerContext, MixerInfo, MixerEventContext, MixerEventRoutine);
/* store result */ /* store result */
*MixerHandle = (HANDLE)MixerInfo; *MixerHandle = (HANDLE)MixerInfo;
return MM_STATUS_SUCCESS; return MM_STATUS_SUCCESS;
@ -687,7 +686,6 @@ MMixerPrintMixers(
DPRINT1("WaveOutCount %lu\n", MixerList->WaveOutListCount); DPRINT1("WaveOutCount %lu\n", MixerList->WaveOutListCount);
DPRINT1("MixerCount %p\n", MixerList->MixerListCount); DPRINT1("MixerCount %p\n", MixerList->MixerListCount);
for(Index = 0; Index < MixerList->MixerListCount; Index++) for(Index = 0; Index < MixerList->MixerListCount; Index++)
{ {
/* get mixer info */ /* get mixer info */

5
sdk/lib/drivers/sound/mmixer/sup.c
View file

@ -8,7 +8,7 @@
#include "precomp.h" #include "precomp.h"
#define YDEBUG // #define NDEBUG
#include <debug.h> #include <debug.h>
const GUID KSNODETYPE_SUM = {0xDA441A60L, 0xC556, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; const GUID KSNODETYPE_SUM = {0xDA441A60L, 0xC556, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}};
@ -36,7 +36,6 @@ const GUID KSDATAFORMAT_TYPE_MUSIC = {0xE725D360L, 0x62CC, 0x11CF, {0xA5, 0xD6,
const GUID KSDATAFORMAT_SUBTYPE_MIDI = {0x1D262760L, 0xE957, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; const GUID KSDATAFORMAT_SUBTYPE_MIDI = {0x1D262760L, 0xE957, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}};
const GUID KSDATAFORMAT_SPECIFIER_NONE = {0x0F6417D6L, 0xC318, 0x11D0, {0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; const GUID KSDATAFORMAT_SPECIFIER_NONE = {0x0F6417D6L, 0xC318, 0x11D0, {0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}};
MIXER_STATUS MIXER_STATUS
MMixerVerifyContext( MMixerVerifyContext(
IN PMIXER_CONTEXT MixerContext) IN PMIXER_CONTEXT MixerContext)
@ -125,7 +124,6 @@ MMixerFreeMixerInfo(
MixerContext->Free((PVOID)MixerInfo); MixerContext->Free((PVOID)MixerInfo);
} }
LPMIXER_DATA LPMIXER_DATA
MMixerGetMixerDataByDeviceHandle( MMixerGetMixerDataByDeviceHandle(
IN PMIXER_CONTEXT MixerContext, IN PMIXER_CONTEXT MixerContext,
@ -156,7 +154,6 @@ MMixerGetMixerDataByDeviceHandle(
return NULL; return NULL;
} }
LPMIXER_INFO LPMIXER_INFO
MMixerGetMixerInfoByIndex( MMixerGetMixerInfoByIndex(
IN PMIXER_CONTEXT MixerContext, IN PMIXER_CONTEXT MixerContext,

10
sdk/lib/drivers/sound/mmixer/topology.c
View file

@ -8,7 +8,7 @@
#include "precomp.h" #include "precomp.h"
#define YDEBUG // #define NDEBUG
#include <debug.h> #include <debug.h>
VOID VOID
@ -37,11 +37,8 @@ MMixerPrintTopology(
Topology->TopologyNodes[Index].NodeConnectedFromCount, Topology->TopologyNodes[Index].NodeConnectedToCount, Topology->TopologyNodes[Index].Visited, Topology->TopologyNodes[Index].NodeConnectedFromCount, Topology->TopologyNodes[Index].NodeConnectedToCount, Topology->TopologyNodes[Index].Visited,
Topology->TopologyNodes[Index].PinConnectedFromCount, Topology->TopologyNodes[Index].PinConnectedToCount); Topology->TopologyNodes[Index].PinConnectedFromCount, Topology->TopologyNodes[Index].PinConnectedToCount);
} }
} }
MIXER_STATUS MIXER_STATUS
MMixerAllocateTopology( MMixerAllocateTopology(
IN PMIXER_CONTEXT MixerContext, IN PMIXER_CONTEXT MixerContext,
@ -708,7 +705,6 @@ MMixerGetNodeIndexFromGuid(
return MAXULONG; return MAXULONG;
} }
VOID VOID
MMixerGetAllUpOrDownstreamPinsFromNodeIndex( MMixerGetAllUpOrDownstreamPinsFromNodeIndex(
IN PMIXER_CONTEXT MixerContext, IN PMIXER_CONTEXT MixerContext,
@ -848,7 +844,6 @@ MMixerGetAllUpOrDownstreamPinsFromPinIndex(
TopologyPinsCount = Pin->PinConnectedToCount; TopologyPinsCount = Pin->PinConnectedToCount;
} }
/* reset visited status */ /* reset visited status */
MMixerResetTopologyVisitStatus(Topology); MMixerResetTopologyVisitStatus(Topology);
@ -906,7 +901,6 @@ MMixerGetAllUpOrDownstreamNodesFromPinIndex(
TopologyNodesCount = Pin->NodesConnectedToCount; TopologyNodesCount = Pin->NodesConnectedToCount;
} }
/* reset visited status */ /* reset visited status */
MMixerResetTopologyVisitStatus(Topology); MMixerResetTopologyVisitStatus(Topology);
@ -924,7 +918,6 @@ MMixerGetAllUpOrDownstreamNodesFromPinIndex(
} }
} }
VOID VOID
MMixerGetNextNodesFromPinIndex( MMixerGetNextNodesFromPinIndex(
IN PMIXER_CONTEXT MixerContext, IN PMIXER_CONTEXT MixerContext,
@ -1248,7 +1241,6 @@ MMixerIsTopologyNodeReserved(
*bReserved = Topology->TopologyNodes[NodeIndex].Reserved; *bReserved = Topology->TopologyNodes[NodeIndex].Reserved;
} }
MIXER_STATUS MIXER_STATUS
MMixerCreateTopology( MMixerCreateTopology(
IN PMIXER_CONTEXT MixerContext, IN PMIXER_CONTEXT MixerContext,

8
sdk/lib/drivers/sound/mmixer/wave.c
View file

@ -8,7 +8,7 @@
#include "precomp.h" #include "precomp.h"
#define YDEBUG // #define NDEBUG
#include <debug.h> #include <debug.h>
const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}};
@ -111,9 +111,6 @@ MMixerGetWaveInfoByIndexAndType(
return MM_STATUS_INVALID_PARAMETER; return MM_STATUS_INVALID_PARAMETER;
} }
VOID VOID
MMixerInitializeDataFormat( MMixerInitializeDataFormat(
IN PKSDATAFORMAT_WAVEFORMATEX DataFormat, IN PKSDATAFORMAT_WAVEFORMATEX DataFormat,
@ -137,7 +134,6 @@ MMixerInitializeDataFormat(
DataFormat->DataFormat.SampleSize = 4; DataFormat->DataFormat.SampleSize = 4;
} }
MIXER_STATUS MIXER_STATUS
MMixerGetAudioPinDataRanges( MMixerGetAudioPinDataRanges(
IN PMIXER_CONTEXT MixerContext, IN PMIXER_CONTEXT MixerContext,
@ -307,7 +303,6 @@ MMixerCheckFormat(
/* check if pin supports the sample rate in 16-Bit Mono */ /* check if pin supports the sample rate in 16-Bit Mono */
Result |= TestRange[Index].Bit16Mono; Result |= TestRange[Index].Bit16Mono;
if (DataRangeAudio->MaximumChannels > 1) if (DataRangeAudio->MaximumChannels > 1)
{ {
/* check if pin supports the sample rate in 16-Bit Stereo */ /* check if pin supports the sample rate in 16-Bit Stereo */
@ -317,7 +312,6 @@ MMixerCheckFormat(
} }
} }
if (bInput) if (bInput)
WaveInfo->u.InCaps.dwFormats = Result; WaveInfo->u.InCaps.dwFormats = Result;
else else