Author: janderwald
Date: Sat Dec 3 13:55:07 2011
New Revision: 54571
URL: http://svn.reactos.org/svn/reactos?rev=54571&view=rev
Log:
- debug code for bug 6663
Modified:
trunk/reactos/lib/drivers/sound/mmixer/controls.c
trunk/reactos/lib/drivers/sound/mmixer/priv.h
Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sat Dec 3 13:55:07 2011
@@ -468,12 +468,15 @@
/* get next nodes */
MMixerGetNextNodesFromPinIndex(MixerContext, Topology, PinId, bUpStream, &NodesCount, Nodes);
- if (NodesCount > 1)
- {
- /* FIXME: the pin is connected by several nodes */
- DPRINT1("Topology split detected at Pin %lu bUpStream %lu NodesCount %lu", PinId, bUpStream, NodesCount);
- for(NodeIndex = 0; NodeIndex < NodesCount; NodeIndex++)
- DPRINT1("Pin Connected from Node %lu", Nodes[NodeIndex]);
+ if (NodesCount == 0)
+ {
+ /* a pin which is not connected from any node
+ * a) it is a topology bug (driver bug)
+ * b) the request is from an alternative mixer
+ alternative mixer code scans all pins which have not been used and tries to build lines
+ */
+ DPRINT1("MMixerCountMixerControls PinId %lu is not connected by any node\n", PinId);
+ MMixerPrintTopology(Topology);
return MM_STATUS_UNSUCCESSFUL;
}
Modified: trunk/reactos/lib/drivers/sound/mmixer/priv.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/p…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] Sat Dec 3 13:55:07 2011
@@ -523,3 +523,6 @@
IN ULONG NodeIndex,
OUT PULONG OutPinCount,
OUT PULONG OutPins);
+
+VOID
+MMixerPrintTopology();