OSDN Git Service

PCM: Fill SND_CHMAP_NA to silent channels in route plugin
authorTakashi Iwai <tiwai@suse.de>
Thu, 20 Sep 2012 11:43:12 +0000 (13:43 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 20 Sep 2012 11:43:12 +0000 (13:43 +0200)
Instead of SND_CHMAP_UNKNOWN, fill SND_CHMAP_NA to the silent channels.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
src/pcm/pcm_route.c

index a5c5b04..a3d1695 100644 (file)
@@ -720,11 +720,13 @@ static snd_pcm_chmap_t *snd_pcm_route_get_chmap(snd_pcm_t *pcm)
                return NULL;
        }
        map->channels = nsrcs;
+       for (src = 0; src < nsrcs; src++)
+               map->pos[src] = SND_CHMAP_NA;
        for (dst = 0; dst < route->params.ndsts; dst++) {
                snd_pcm_route_ttable_dst_t *d = &route->params.dsts[dst];
                for (src = 0; src < d->nsrcs; src++) {
                        int c = d->srcs[src].channel;
-                       if (c < nsrcs && !map->pos[c])
+                       if (c < nsrcs && map->pos[c] == SND_CHMAP_NA)
                                map->pos[c] = slave_map->pos[dst];
                }
        }