diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-11-01 12:25:14 +0100 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-11-02 19:20:03 +0100 |
| commit | 30f3b537b2938e808923d28f2ff765e136a30ba8 (patch) | |
| tree | a8e977cf73609b8cd026a86793337dd2e5d165ae | |
| parent | c9b59548510845e668b6e87c1f69e62302f93d56 (diff) | |
| download | mpv-30f3b537b2938e808923d28f2ff765e136a30ba8.tar.bz2 mpv-30f3b537b2938e808923d28f2ff765e136a30ba8.tar.xz | |
audio: untypedef af_cfg
| -rw-r--r-- | cfg-mplayer.h | 2 | ||||
| -rw-r--r-- | libaf/af.h | 6 | ||||
| -rw-r--r-- | libaf/af_resample.c | 2 | ||||
| -rw-r--r-- | libaf/af_volume.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/dec_audio.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 51360dbf85..48f44a6fde 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -205,7 +205,7 @@ const m_option_t mfopts_conf[]={ }; #include "libaf/af.h" -extern af_cfg_t af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c +extern struct af_cfg af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c const m_option_t audio_filter_conf[]={ {"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, {"force", &af_cfg.force, CONF_TYPE_INT, CONF_RANGE, 0, 7, NULL}, diff --git a/libaf/af.h b/libaf/af.h index 3188c64e48..668c67e80d 100644 --- a/libaf/af.h +++ b/libaf/af.h @@ -97,11 +97,11 @@ extern int* af_cpu_speed; #endif // Configuration switches -typedef struct af_cfg_s{ +struct af_cfg { int force; // Initialization type char** list; /* list of names of filters that are added to filter list during first initialization of stream */ -}af_cfg_t; +}; // Current audio stream typedef struct af_stream @@ -113,7 +113,7 @@ typedef struct af_stream struct mp_audio input; struct mp_audio output; // Configuration for this stream - af_cfg_t cfg; + struct af_cfg cfg; struct MPOpts *opts; }af_stream_t; diff --git a/libaf/af_resample.c b/libaf/af_resample.c index 51c51b0bf0..1f0b7cc942 100644 --- a/libaf/af_resample.c +++ b/libaf/af_resample.c @@ -279,7 +279,7 @@ static int control(struct af_instance* af, int cmd, void* arg) return af->control(af,AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET, &rate); } case AF_CONTROL_POST_CREATE: - if((((af_cfg_t*)arg)->force & AF_INIT_FORMAT_MASK) == AF_INIT_FLOAT) + if((((struct af_cfg*)arg)->force & AF_INIT_FORMAT_MASK) == AF_INIT_FLOAT) ((af_resample_t*)af->setup)->setup = RSMP_FLOAT; return AF_OK; case AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET: diff --git a/libaf/af_volume.c b/libaf/af_volume.c index 12f85d9afc..ecf181c8b8 100644 --- a/libaf/af_volume.c +++ b/libaf/af_volume.c @@ -92,7 +92,7 @@ static int control(struct af_instance* 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_FORMAT_MASK) == + 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: diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index 3a3cb51417..f282687a59 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -39,7 +39,7 @@ int fakemono = 0; -af_cfg_t af_cfg = { 1, NULL }; // Configuration for audio filters +struct af_cfg af_cfg = { 1, NULL }; // Configuration for audio filters void afm_help(void) { @@ -291,7 +291,7 @@ int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate, af_fix_parameters(&(afs->output)); // filter config: - memcpy(&afs->cfg, &af_cfg, sizeof(af_cfg_t)); + memcpy(&afs->cfg, &af_cfg, sizeof(struct af_cfg)); mp_tmsg(MSGT_DECAUDIO, MSGL_V, "Building audio filter chain for %dHz/%dch/%s -> %dHz/%dch/%s...\n", afs->input.rate, afs->input.nch, |