Mercurial > mplayer.hg
diff libaf/af_pan.c @ 16493:851d10933f27
Fix af_pan commandline mess and (hopefully) improve description.
It should now output the right number of channels and it doesn't silently
clamp values to the too restrictive [0, 1] range.
author | reimar |
---|---|
date | Thu, 15 Sep 2005 11:41:23 +0000 |
parents | 95bb94a930a3 |
children | 105f32787336 |
line wrap: on
line diff
--- a/libaf/af_pan.c Thu Sep 15 10:25:43 2005 +0000 +++ b/libaf/af_pan.c Thu Sep 15 11:41:23 2005 +0000 @@ -64,10 +64,9 @@ cp = &((char*)arg)[n]; j = 0; k = 0; while((*cp == ':') && (k < AF_NCH)){ - sscanf(cp, ":%f%n" , &s->level[k][j], &n); - s->level[k][j] = clamp(s->level[k][j],0.0,1.0); + sscanf(cp, ":%f%n" , &s->level[j][k], &n); af_msg(AF_MSG_VERBOSE,"[pan] Pan level from channel %i to" - " channel %i = %f\n",j,k,s->level[k][j]); + " channel %i = %f\n",k,j,s->level[j][k]); cp =&cp[n]; j++; if(j>=nch){ @@ -81,14 +80,18 @@ int i; int ch = ((af_control_ext_t*)arg)->ch; float* level = ((af_control_ext_t*)arg)->arg; + if (ch >= AF_NCH) + return AF_FALSE; for(i=0;i<AF_NCH;i++) - s->level[ch][i] = clamp(level[i],0.0,1.0); + s->level[ch][i] = level[i]; return AF_OK; } case AF_CONTROL_PAN_LEVEL | AF_CONTROL_GET:{ int i; int ch = ((af_control_ext_t*)arg)->ch; float* level = ((af_control_ext_t*)arg)->arg; + if (ch >= AF_NCH) + return AF_FALSE; for(i=0;i<AF_NCH;i++) level[i] = s->level[ch][i]; return AF_OK;