Mercurial > mplayer.hg
changeset 31425:2392ad3cec9c
Move af_cfg extern variable declaration to dec_audio.h.
| author | diego |
|---|---|
| date | Sun, 20 Jun 2010 15:43:45 +0000 |
| parents | 283eac48391d |
| children | 974cfaa54e83 |
| files | cfg-common.h gui/interface.c gui/win32/interface.c libmpcodecs/dec_audio.h |
| diffstat | 4 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-common.h Sun Jun 20 15:38:38 2010 +0000 +++ b/cfg-common.h Sun Jun 20 15:43:45 2010 +0000 @@ -200,7 +200,6 @@ }; #include "libaf/af.h" -extern af_cfg_t 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},
--- a/gui/interface.c Sun Jun 20 15:38:38 2010 +0000 +++ b/gui/interface.c Sun Jun 20 15:43:45 2010 +0000 @@ -52,8 +52,6 @@ #include "libaf/equalizer.h" #include "libass/ass_mp.h" -extern af_cfg_t af_cfg; - #ifdef CONFIG_ICONV #include <iconv.h> #endif @@ -61,6 +59,7 @@ #include "stream/stream.h" #include "libmpdemux/demuxer.h" #include "libmpdemux/stheader.h" +#include "libmpcodecs/dec_audio.h" #include "libmpcodecs/dec_video.h" #ifdef CONFIG_DVDREAD
--- a/gui/win32/interface.c Sun Jun 20 15:38:38 2010 +0000 +++ b/gui/win32/interface.c Sun Jun 20 15:43:45 2010 +0000 @@ -40,6 +40,7 @@ #include "libao2/audio_out.h" #include "access_mpcontext.h" #include "libmpcodecs/vd.h" +#include "libmpcodecs/dec_audio.h" #include "gui/mplayer/gmplayer.h" #include "mp_core.h" #include "gui.h" @@ -49,7 +50,6 @@ #endif extern int vcd_track; -extern af_cfg_t af_cfg; int guiWinID = 0; char *skinName = NULL;
--- a/libmpcodecs/dec_audio.h Sun Jun 20 15:38:38 2010 +0000 +++ b/libmpcodecs/dec_audio.h Sun Jun 20 15:43:45 2010 +0000 @@ -19,8 +19,11 @@ #ifndef MPLAYER_DEC_AUDIO_H #define MPLAYER_DEC_AUDIO_H +#include "libaf/af.h" #include "libmpdemux/stheader.h" +extern af_cfg_t af_cfg; + extern int audio_output_channels; extern int fakemono;