diff options
Diffstat (limited to 'audio/filter')
| -rw-r--r-- | audio/filter/af.c | 4 | ||||
| -rw-r--r-- | audio/filter/af_volume.c | 8 | ||||
| -rw-r--r-- | audio/filter/control.h | 5 |
3 files changed, 3 insertions, 14 deletions
diff --git a/audio/filter/af.c b/audio/filter/af.c index c36c8f6e8f..d6d09158ef 100644 --- a/audio/filter/af.c +++ b/audio/filter/af.c @@ -154,9 +154,7 @@ static struct af_instance *af_create(struct af_stream *s, mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Adding filter %s \n", name); // Initialize the new filter - if (AF_OK == new->info->open(new) && - AF_ERROR < new->control(new, AF_CONTROL_POST_CREATE, &s->cfg)) - { + if (AF_OK == new->info->open(new)) { if (cmdline) { if (AF_ERROR >= new->control(new, AF_CONTROL_COMMAND_LINE, cmdline)) goto err_out; diff --git a/audio/filter/af_volume.c b/audio/filter/af_volume.c index ecf181c8b8..474ad72777 100644 --- a/audio/filter/af_volume.c +++ b/audio/filter/af_volume.c @@ -87,14 +87,10 @@ static int control(struct af_instance* af, int cmd, void* arg) float v=0.0; float vol[AF_NCH]; int i; - sscanf((char*)arg,"%f:%i", &v, &s->soft); + sscanf((char*)arg,"%f:%i:%i", &v, &s->soft, &s->fast); for(i=0;i<AF_NCH;i++) vol[i]=v; return control(af,AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET, vol); } - case AF_CONTROL_POST_CREATE: - s->fast = ((((struct af_cfg*)arg)->force & AF_INIT_FORMAT_MASK) == - AF_INIT_FLOAT) ? 0 : 1; - return AF_OK; case AF_CONTROL_VOLUME_ON_OFF | AF_CONTROL_SET: memcpy(s->enable,(int*)arg,AF_NCH*sizeof(int)); return AF_OK; @@ -122,7 +118,7 @@ static int control(struct af_instance* af, int cmd, void* arg) for(i=0;i<AF_NCH;i++) m=max(m,s->max[i]); af_to_dB(1, &m, &m, 10.0); - mp_msg(MSGT_AFILTER, MSGL_INFO, "[volume] The maximum volume was %0.2fdB \n", m); + mp_msg(MSGT_AFILTER, MSGL_V, "[volume] The maximum volume was %0.2fdB \n", m); } return AF_OK; } diff --git a/audio/filter/control.h b/audio/filter/control.h index 323b9a3924..1342d5f299 100644 --- a/audio/filter/control.h +++ b/audio/filter/control.h @@ -98,11 +98,6 @@ typedef struct af_control_ext_s{ // OPTIONAL CALLS -/* Called just after creation with the af_cfg for the stream in which - the filter resides as input parameter this call can be used by the - filter to initialize itself */ -#define AF_CONTROL_POST_CREATE 0x00000100 | AF_CONTROL_OPTIONAL - // Called just before destruction of a filter #define AF_CONTROL_PRE_DESTROY 0x00000200 | AF_CONTROL_OPTIONAL |