[MPlayer-cvslog] r31446 - in trunk: cfg-mplayer.h libmenu/menu.h

[diego]

Author: diego
Date: Thu Jun 17 11:12:38 2010
New Revision: 31446

Log:
Move menu-related extern variable declarations to menu.h.

Modified:
   trunk/cfg-mplayer.h
   trunk/libmenu/menu.h

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	Thu Jun 17 10:38:12 2010	(r31445)
+++ trunk/cfg-mplayer.h	Thu Jun 17 11:12:38 2010	(r31446)
@@ -25,6 +25,7 @@
 
 #include "cfg-common.h"
 #include "libmpcodecs/vd.h"
+#include "libmenu/menu.h"
 #include "libvo/aspect.h"
 #include "libvo/vo_fbdev.h"
 #include "libvo/vo_zr.h"
@@ -39,13 +40,6 @@ extern float vo_panscanrange;
 extern char *vo_geometry;
 extern int stop_xscreensaver;
 
-extern int menu_startup;
-extern int menu_keepdir;
-extern char *menu_chroot;
-extern char *menu_fribidi_charset;
-extern int menu_flip_hebrew;
-extern int menu_fribidi_flip_commas;
-
 extern char *unrar_executable;
 
 extern const m_option_t dxr2_opts[];

Modified: trunk/libmenu/menu.h
==============================================================================
--- trunk/libmenu/menu.h	Thu Jun 17 10:38:12 2010	(r31445)
+++ trunk/libmenu/menu.h	Thu Jun 17 11:12:38 2010	(r31446)
@@ -23,6 +23,14 @@
 #include "libmpcodecs/mp_image.h"
 #include "libmpcodecs/vf.h"
 
+extern char *menu_chroot;
+extern char *menu_fribidi_charset;
+extern int menu_flip_hebrew;
+extern int menu_fribidi_flip_commas;
+extern int menu_keepdir;
+extern int menu_startup;
+
+
 struct menu_priv_s;
 typedef struct  menu_s menu_t;