Hi,
Could that "fix" be removed from the 4.1 and 4.0 repositories? It's making far
far more trouble than it solves[1]. (Solving this properly will be best, but
Zak's patch exists now).
[1] http://4front-tech.com/forum/viewtopic.php?p=9348
Yours,
Yair K.
diff -r c7470d79a39a cmd/ossxmix/ossxmix.c
--- a/cmd/ossxmix/ossxmix.c Tue Jun 17 00:23:06 2008 +0300
+++ b/cmd/ossxmix/ossxmix.c Wed Jun 18 10:50:24 2008 +0300
@@ -938,30 +938,6 @@
case MIXT_GROUP:
if (!show_all)
break;
-#if 1
-/*
- * Ignore the group if the next mixer entry is also a group. This
- * should prevent empty groups on the screen. By Clive Wright.
- */
- nextrec = &extrec[dev][i+1];
- nextrec->dev = dev;
- nextrec->ctrl = i+1;
-
- if (ioctl (mixer_fd, SNDCTL_MIX_EXTINFO, nextrec) == -1)
- {
- if (errno == EINVAL)
- printf ("Incompatible OSS version\n");
- else
- perror ("SNDCTL_MIX_EXTINFO");
- exit (-1);
- }
- /*
- * Ignore group if next record is also a group with the same parent
- */
- if (nextrec->type == MIXT_GROUP
- && (thisrec->parent == nextrec->parent))
- break;
-#endif
parent = thisrec->parent;
name = cut_name (thisrec->id);
if (*extnames[parent] == '\0')
_______________________________________________
oss-devel mailing list
oss-devel@mailman.opensound.com
http://mailman.opensound.com/mailman/listinfo/oss-devel
