From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 20 Oct 2006 15:57:16 +0000 (+0200)
Subject: Revert dmix.conf and dsnoop.conf
X-Git-Tag: v1.0.14rc1~15
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=21207351a863cec1b012281967d4f2dfa58e11a2;p=alsa-lib.git

Revert dmix.conf and dsnoop.conf

Revert dmix.conf and dsnoop.conf.
The ipc key offset had been already modified to be unique for
each card, stream, device and subdevice interanally in dmix &
co plugins.
---

diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf
index f5de5b56..1bd3efef 100644
--- a/src/conf/pcm/dmix.conf
+++ b/src/conf/pcm/dmix.conf
@@ -38,23 +38,8 @@ pcm.!dmix {
 	}
 	type dmix
 	ipc_key {
-		@func iadd
-		integers [
-			{
-				@func refer
-				name defaults.pcm.ipc_key
-			}
-			{
-				@func imul
-				integers [
-					{
-						@func card_inum
-						$CARD
-					}
-					2
-				]
-			}
-		]
+		@func refer
+		name defaults.pcm.ipc_key
 	}
 	ipc_gid {
 		@func refer
diff --git a/src/conf/pcm/dsnoop.conf b/src/conf/pcm/dsnoop.conf
index 14a47d70..c461f0c9 100644
--- a/src/conf/pcm/dsnoop.conf
+++ b/src/conf/pcm/dsnoop.conf
@@ -38,23 +38,8 @@ pcm.!dsnoop {
 	}
 	type dsnoop
 	ipc_key {
-		@func iadd
-		integers [
-			{
-				@func refer
-				name defaults.pcm.ipc_key
-			}
-			{
-				@func imul
-				integers [
-					{
-						@func card_inum
-						$CARD
-					}
-					2
-				]
-			}
-		]
+		@func refer
+		name defaults.pcm.ipc_key
 	}	
 	ipc_gid {
 		@func refer