[MPlayer-cvslog] r31491 - in trunk: cfg-common.h gui/interface.c gui/win32/interface.c libmpcodecs/dec_audio.h

[diego]

Author: diego
Date: Sun Jun 20 17:43:45 2010
New Revision: 31491

Log:
Move af_cfg extern variable declaration to dec_audio.h.

Modified:
   trunk/cfg-common.h
   trunk/gui/interface.c
   trunk/gui/win32/interface.c
   trunk/libmpcodecs/dec_audio.h

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Sun Jun 20 17:38:38 2010	(r31490)
+++ trunk/cfg-common.h	Sun Jun 20 17:43:45 2010	(r31491)
@@ -200,7 +200,6 @@ 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
 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},

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sun Jun 20 17:38:38 2010	(r31490)
+++ trunk/gui/interface.c	Sun Jun 20 17:43:45 2010	(r31491)
@@ -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 @@ extern af_cfg_t af_cfg;
 #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

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Sun Jun 20 17:38:38 2010	(r31490)
+++ trunk/gui/win32/interface.c	Sun Jun 20 17:43:45 2010	(r31491)
@@ -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;

Modified: trunk/libmpcodecs/dec_audio.h
==============================================================================
--- trunk/libmpcodecs/dec_audio.h	Sun Jun 20 17:38:38 2010	(r31490)
+++ trunk/libmpcodecs/dec_audio.h	Sun Jun 20 17:43:45 2010	(r31491)
@@ -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;