diff options
| author | anders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-10 01:01:38 +0000 |
|---|---|---|
| committer | anders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-10 01:01:38 +0000 |
| commit | e1718bed1926f2056fa77d6b15aa74a823b32fa0 (patch) | |
| tree | 0d9403254fcf9d9286b8e6a3ecec0470421df9d8 /libaf/af_volume.c | |
| parent | 61a46b242b4a17f4ae836f3f56bcedf277aeae88 (diff) | |
| download | mpv-e1718bed1926f2056fa77d6b15aa74a823b32fa0.tar.bz2 mpv-e1718bed1926f2056fa77d6b15aa74a823b32fa0.tar.xz | |
New auto config for volume and resample and added support for float flag in configuration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8868 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf/af_volume.c')
| -rw-r--r-- | libaf/af_volume.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libaf/af_volume.c b/libaf/af_volume.c index 620a66bfa2..4fc6905f4e 100644 --- a/libaf/af_volume.c +++ b/libaf/af_volume.c @@ -60,7 +60,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) af->data->rate = ((af_data_t*)arg)->rate; af->data->nch = ((af_data_t*)arg)->nch; - if(s->fast){ + if(s->fast && (((af_data_t*)arg)->format != (AF_FORMAT_F | AF_FORMAT_NE))){ af->data->format = AF_FORMAT_SI | AF_FORMAT_NE; af->data->bps = 2; } @@ -83,7 +83,8 @@ static int control(struct af_instance_s* af, int cmd, void* arg) return control(af,AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET, vol); } case AF_CONTROL_POST_CREATE: - s->fast = ((af_cfg_t*)arg)->force == AF_INIT_SLOW ? 1 : 0; + s->fast = (((af_cfg_t*)arg)->force & AF_INIT_FORMAT_MASK) == + AF_INIT_FLOAT ? 1 : 0; return AF_OK; case AF_CONTROL_VOLUME_ON_OFF | AF_CONTROL_SET: memcpy(s->enable,(int*)arg,AF_NCH*sizeof(int)); |