From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 3 Feb 2004 14:44:48 +0000 (+0000)
Subject: The format condition was wrong (dmix<->dsnoop)
X-Git-Tag: v1.0.3~28
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=a6ad2629e33735b866f7816bc90ffcb6275cb2ec;p=alsa-lib.git

The format condition was wrong (dmix<->dsnoop)
---

diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
index 8473d9c0..ea810063 100644
--- a/src/pcm/pcm_dmix.c
+++ b/src/pcm/pcm_dmix.c
@@ -1215,6 +1215,14 @@ int _snd_pcm_dmix_open(snd_pcm_t **pcmp, const char *name,
 	if (err < 0)
 		return err;
 
+	/* sorry, limited features */
+        if (params.format != SND_PCM_FORMAT_S16 &&
+            params.format != SND_PCM_FORMAT_S32) {
+		SNDERR("invalid format, specify s16 or s32");
+		snd_config_delete(sconf);
+		return -EINVAL;
+	}
+
 	params.period_size = psize;
 	params.buffer_size = bsize;
 
diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
index 07896676..63d3169e 100644
--- a/src/pcm/pcm_dsnoop.c
+++ b/src/pcm/pcm_dsnoop.c
@@ -837,14 +837,6 @@ int _snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,
 	if (err < 0)
 		return err;
 
-	/* sorry, limited features */
-	if (params.format != SND_PCM_FORMAT_S16 &&
-	    params.format != SND_PCM_FORMAT_S32) {
-		SNDERR("invalid format, specify s16 or s32");
-		snd_config_delete(sconf);
-		return -EINVAL;
-	}
-
 	params.period_size = psize;
 	params.buffer_size = bsize;
 	err = snd_pcm_dsnoop_open(pcmp, name, ipc_key, ipc_perm, &params, bindings, slowptr, root, sconf, stream, mode);