From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 18 Mar 2015 16:05:16 +0000 (+0100)
Subject: mix: Fix extplug version ifdef checks
X-Git-Tag: v1.1.0~7
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=2b7dac75a76301ad2fb270e07ca15935ce48f1ea;p=alsa-plugins.git

mix: Fix extplug version ifdef checks

SND_PCM_EXTPLUG_VERSION must be checked with 0x10002, not 0x102.

Reported-by: Ethan Grammatikidis <eekee57@fastmail.fm>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/mix/pcm_upmix.c b/mix/pcm_upmix.c
index de5be41..86d2d9d 100644
--- a/mix/pcm_upmix.c
+++ b/mix/pcm_upmix.c
@@ -371,7 +371,7 @@ static int upmix_close(snd_pcm_extplug_t *ext)
 	return 0;
 }
 
-#if SND_PCM_EXTPLUG_VERSION >= 0x102
+#if SND_PCM_EXTPLUG_VERSION >= 0x10002
 static unsigned int chmap[8][8] = {
 	{ SND_CHMAP_MONO },
 	{ SND_CHMAP_FL, SND_CHMAP_FR },
@@ -418,13 +418,13 @@ static snd_pcm_chmap_t *upmix_get_chmap(snd_pcm_extplug_t *ext)
 	memcpy(map->pos, &chmap[ext->channels - 1][0], ext->channels * sizeof(int));
 	return map;
 }
-#endif /* SND_PCM_EXTPLUG_VERSION >= 0x102 */
+#endif /* SND_PCM_EXTPLUG_VERSION >= 0x10002 */
 
 static const snd_pcm_extplug_callback_t upmix_callback = {
 	.transfer = upmix_transfer,
 	.init = upmix_init,
 	.close = upmix_close,
-#if SND_PCM_EXTPLUG_VERSION >= 0x102
+#if SND_PCM_EXTPLUG_VERSION >= 0x10002
 	.query_chmaps = upmix_query_chmaps,
 	.get_chmap = upmix_get_chmap,
 #endif
diff --git a/mix/pcm_vdownmix.c b/mix/pcm_vdownmix.c
index 03e5adb..77c274a 100644
--- a/mix/pcm_vdownmix.c
+++ b/mix/pcm_vdownmix.c
@@ -277,7 +277,7 @@ static int vdownmix_init(snd_pcm_extplug_t *ext)
 	return 0;
 }
 
-#if SND_PCM_EXTPLUG_VERSION >= 0x102
+#if SND_PCM_EXTPLUG_VERSION >= 0x10002
 static unsigned int chmap[6] = {
 	SND_CHMAP_FL, SND_CHMAP_FR,
 	SND_CHMAP_RL, SND_CHMAP_RR,
@@ -319,13 +319,13 @@ static snd_pcm_chmap_t *vdownmix_get_chmap(snd_pcm_extplug_t *ext)
 	memcpy(map->pos, chmap, ext->channels * sizeof(int));
 	return map;
 }
-#endif /* SND_PCM_EXTPLUG_VERSION >= 0x102 */
+#endif /* SND_PCM_EXTPLUG_VERSION >= 0x10002 */
 
 static const snd_pcm_extplug_callback_t vdownmix_callback = {
 	.transfer = vdownmix_transfer,
 	.init = vdownmix_init,
 	/* .dump = filr_dump, */
-#if SND_PCM_EXTPLUG_VERSION >= 0x102
+#if SND_PCM_EXTPLUG_VERSION >= 0x10002
 	.query_chmaps = vdownmix_query_chmaps,
 	.get_chmap = vdownmix_get_chmap,
 #endif