| Message ID | 1392996262-27970-2-git-send-email-david.henningsson@canonical.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
At Fri, 21 Feb 2014 16:24:20 +0100, David Henningsson wrote: > > Instead of writing e g "0" and "1", one can now write "FL" and "FR" instead. > > E g: > ttable.0.FL 1 > ttable.1.FR 1 > ttable.2.LFE 1 > > Signed-off-by: David Henningsson <david.henningsson@canonical.com> > --- > src/pcm/pcm_route.c | 22 ++++++++++++++++++++-- > 1 file changed, 20 insertions(+), 2 deletions(-) > > diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c > index 2beedf6..ffc283f 100644 > --- a/src/pcm/pcm_route.c > +++ b/src/pcm/pcm_route.c > @@ -789,6 +789,24 @@ static void snd_pcm_route_dump(snd_pcm_t *pcm, snd_output_t *out) > snd_pcm_dump(route->plug.gen.slave, out); > } > > +static int safe_chmapchannel(const char *id, long *channel) You need no safe_ prefix for this function. safe_strtol() is just because strtol() already exists in an unsafe way. Besides that, I find it also OK to just return the channel (>= 0) or a negative error. But it's no big matter in which form is. Takashi > +{ > + int err; > + int ch; > + err = safe_strtol(id, channel); > + if (err >= 0) > + return err; > + > + ch = (int) snd_pcm_chmap_from_string(id); > + if (ch == -1) > + return -EINVAL; > + > + /* For now, assume standard channel mapping */ > + *channel = ch - SND_CHMAP_FL; > + return 0; > +} > + > + > static const snd_pcm_ops_t snd_pcm_route_ops = { > .close = snd_pcm_route_close, > .info = snd_pcm_generic_info, > @@ -983,7 +1001,7 @@ int snd_pcm_route_determine_ttable(snd_config_t *tt, > const char *id; > if (snd_config_get_id(jnode, &id) < 0) > continue; > - err = safe_strtol(id, &schannel); > + err = safe_chmapchannel(id, &schannel); > if (err < 0) { > SNDERR("Invalid slave channel: %s", id); > return -EINVAL; > @@ -1046,7 +1064,7 @@ int snd_pcm_route_load_ttable(snd_config_t *tt, snd_pcm_route_ttable_entry_t *tt > const char *id; > if (snd_config_get_id(jnode, &id) < 0) > continue; > - err = safe_strtol(id, &schannel); > + err = safe_chmapchannel(id, &schannel); > if (err < 0 || > schannel < 0 || (unsigned int) schannel > tt_ssize || > (schannels > 0 && schannel >= schannels)) { > -- > 1.9.0 >
diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c index 2beedf6..ffc283f 100644 --- a/src/pcm/pcm_route.c +++ b/src/pcm/pcm_route.c @@ -789,6 +789,24 @@ static void snd_pcm_route_dump(snd_pcm_t *pcm, snd_output_t *out) snd_pcm_dump(route->plug.gen.slave, out); } +static int safe_chmapchannel(const char *id, long *channel) +{ + int err; + int ch; + err = safe_strtol(id, channel); + if (err >= 0) + return err; + + ch = (int) snd_pcm_chmap_from_string(id); + if (ch == -1) + return -EINVAL; + + /* For now, assume standard channel mapping */ + *channel = ch - SND_CHMAP_FL; + return 0; +} + + static const snd_pcm_ops_t snd_pcm_route_ops = { .close = snd_pcm_route_close, .info = snd_pcm_generic_info, @@ -983,7 +1001,7 @@ int snd_pcm_route_determine_ttable(snd_config_t *tt, const char *id; if (snd_config_get_id(jnode, &id) < 0) continue; - err = safe_strtol(id, &schannel); + err = safe_chmapchannel(id, &schannel); if (err < 0) { SNDERR("Invalid slave channel: %s", id); return -EINVAL; @@ -1046,7 +1064,7 @@ int snd_pcm_route_load_ttable(snd_config_t *tt, snd_pcm_route_ttable_entry_t *tt const char *id; if (snd_config_get_id(jnode, &id) < 0) continue; - err = safe_strtol(id, &schannel); + err = safe_chmapchannel(id, &schannel); if (err < 0 || schannel < 0 || (unsigned int) schannel > tt_ssize || (schannels > 0 && schannel >= schannels)) {
Instead of writing e g "0" and "1", one can now write "FL" and "FR" instead. E g: ttable.0.FL 1 ttable.1.FR 1 ttable.2.LFE 1 Signed-off-by: David Henningsson <david.henningsson@canonical.com> --- src/pcm/pcm_route.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)