D56239.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D56239.diff
View Options

	diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
	--- a/sys/dev/sound/pcm/channel.h
	+++ b/sys/dev/sound/pcm/channel.h
	@@ -405,11 +405,8 @@



	-#define CHN_N_RATE 0x00000001
	-#define CHN_N_FORMAT 0x00000002
	-#define CHN_N_VOLUME 0x00000004
	-#define CHN_N_BLOCKSIZE 0x00000008
	-#define CHN_N_TRIGGER 0x00000010
	+#define CHN_N_BLOCKSIZE 0x00000001
	+#define CHN_N_TRIGGER 0x00000002

	#define CHN_LATENCY_MIN 0
	#define CHN_LATENCY_MAX 10
	diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
	--- a/sys/dev/sound/pcm/channel.c
	+++ b/sys/dev/sound/pcm/channel.c
	@@ -2351,31 +2351,7 @@
	*/
	run = (CHN_STARTED(c)) ? 1 : 0;
	if (run)
	- flags &= CHN_N_VOLUME \| CHN_N_TRIGGER;
	-
	- if (flags & CHN_N_RATE) {
	- /*
	- * XXX I'll make good use of this someday.
	- * However this is currently being superseded by
	- * the availability of CHN_F_VCHAN_DYNAMIC.
	- */
	- }
	-
	- if (flags & CHN_N_FORMAT) {
	- /*
	- * XXX I'll make good use of this someday.
	- * However this is currently being superseded by
	- * the availability of CHN_F_VCHAN_DYNAMIC.
	- */
	- }
	-
	- if (flags & CHN_N_VOLUME) {
	- /*
	- * XXX I'll make good use of this someday, though
	- * soft volume control is currently pretty much
	- * integrated.
	- */
	- }
	+ flags &= CHN_N_TRIGGER;

	if (flags & CHN_N_BLOCKSIZE) {
	/*