diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-30 18:07:19 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-30 18:07:19 +0000 |
commit | 6138ec05eb7ae0ffcbdad73042cdb2cf445f4286 (patch) | |
tree | 5aa23045f5841a0695d9e916fe66b5aec6753aed | |
parent | e3afb4b2de847d2eda9e6b0a8e07ab3e3abd2737 (diff) | |
download | mpv-6138ec05eb7ae0ffcbdad73042cdb2cf445f4286.tar.bz2 mpv-6138ec05eb7ae0ffcbdad73042cdb2cf445f4286.tar.xz |
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27377 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | cfg-mplayer.h | 4 | ||||
-rw-r--r-- | command.c | 4 | ||||
-rwxr-xr-x | configure | 4 | ||||
-rw-r--r-- | input/input.c | 2 | ||||
-rw-r--r-- | mplayer.c | 12 |
5 files changed, 13 insertions, 13 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 246c8892d9..93f913c963 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -251,7 +251,7 @@ const m_option_t mplayer_opts[]={ #endif {"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL}, {"osd-duration", &osd_duration, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, -#ifdef HAVE_MENU +#ifdef CONFIG_MENU {"menu", &use_menu, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"nomenu", &use_menu, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, {"menu-root", &menu_root, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, @@ -268,7 +268,7 @@ const m_option_t mplayer_opts[]={ #endif /* CONFIG_FRIBIDI */ #else {"menu", "OSD menu support was not compiled in.\n", CONF_TYPE_PRINT,0, 0, 0, NULL}, -#endif /* HAVE_MENU */ +#endif /* CONFIG_MENU */ // these should be moved to -common, and supported in MEncoder {"vobsub", &vobsub_name, CONF_TYPE_STRING, 0, 0, 0, NULL}, @@ -50,7 +50,7 @@ #include "libass/ass.h" #include "libass/ass_mp.h" #endif -#ifdef HAVE_MENU +#ifdef CONFIG_MENU #include "m_struct.h" #include "libmenu/menu.h" #endif @@ -3124,7 +3124,7 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd) "Selected button number %d", button); } #endif -#ifdef HAVE_MENU +#ifdef CONFIG_MENU if (use_menu && dx >= 0.0 && dy >= 0.0) menu_update_mouse_pos(dx, dy); #endif @@ -7256,10 +7256,10 @@ echores "$_byte_order" echocheck "OSD menu" if test "$_menu" = yes ; then - _def_menu='#define HAVE_MENU 1' + _def_menu='#define CONFIG_MENU 1' test $_dvbin = "yes" && _menu_dvbin=yes else -_def_menu='#undef HAVE_MENU' +_def_menu='#undef CONFIG_MENU' _menu_dvbin=no fi echores "$_menu" diff --git a/input/input.c b/input/input.c index 2e26c2b7b0..addf7ed83c 100644 --- a/input/input.c +++ b/input/input.c @@ -174,7 +174,7 @@ static const mp_cmd_t mp_cmds[] = { { MP_CMD_DVDNAV, "dvdnav", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, #endif -#ifdef HAVE_MENU +#ifdef CONFIG_MENU { MP_CMD_MENU, "menu",1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, { MP_CMD_SET_MENU, "set_menu",1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, { MP_CMD_CHELP, "help", 0, { {-1,{0}} } }, @@ -335,7 +335,7 @@ char* current_module=NULL; // for debugging // --- -#ifdef HAVE_MENU +#ifdef CONFIG_MENU #include "m_struct.h" #include "libmenu/menu.h" extern void vf_menu_pause_update(struct vf_instance_s* vf); @@ -600,7 +600,7 @@ void uninit_player(unsigned int mask){ current_module="uninit_vcodec"; if(mpctx->sh_video) uninit_video(mpctx->sh_video); mpctx->sh_video=NULL; -#ifdef HAVE_MENU +#ifdef CONFIG_MENU vf_menu=NULL; #endif } @@ -675,7 +675,7 @@ void uninit_player(unsigned int mask){ initialized_flags&=~INITIALIZED_INPUT; current_module="uninit_input"; mp_input_uninit(); -#ifdef HAVE_MENU +#ifdef CONFIG_MENU if (use_menu) menu_uninit(); #endif @@ -2162,7 +2162,7 @@ int reinit_video_chain(void) { char* vf_arg[] = { "_oldargs_", (char*)mpctx->video_out , NULL }; sh_video->vfilter=(void*)vf_open_filter(NULL,"vo",vf_arg); } -#ifdef HAVE_MENU +#ifdef CONFIG_MENU if(use_menu) { char* vf_arg[] = { "_oldargs_", menu_root, NULL }; vf_menu = vf_open_plugin(libmenu_vfs,sh_video->vfilter,"menu",vf_arg); @@ -2369,7 +2369,7 @@ static void pause_loop(void) break; } #endif -#ifdef HAVE_MENU +#ifdef CONFIG_MENU if (vf_menu) vf_menu_pause_update(vf_menu); #endif @@ -2867,7 +2867,7 @@ else if(!noconsolecontrols) // Set the libstream interrupt callback stream_set_interrupt_callback(mp_input_check_interrupt); -#ifdef HAVE_MENU +#ifdef CONFIG_MENU if(use_menu) { if(menu_cfg && menu_init(mpctx, menu_cfg)) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg); |