Mercurial > mplayer.hg
changeset 31380:1c540767767e
Move menu-related extern variable declarations to menu.h.
| author | diego |
|---|---|
| date | Thu, 17 Jun 2010 09:12:38 +0000 |
| parents | 82fce4fb5049 |
| children | 21da5b5c9842 |
| files | cfg-mplayer.h libmenu/menu.h |
| diffstat | 2 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-mplayer.h Thu Jun 17 08:38:12 2010 +0000 +++ b/cfg-mplayer.h Thu Jun 17 09:12:38 2010 +0000 @@ -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 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[];
--- a/libmenu/menu.h Thu Jun 17 08:38:12 2010 +0000 +++ b/libmenu/menu.h Thu Jun 17 09:12:38 2010 +0000 @@ -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;