[MPlayer-cvslog] r27377 - in trunk: cfg-mplayer.h command.c configure input/input.c mplayer.c

[diego]

Author: diego
Date: Wed Jul 30 20:07:19 2008
New Revision: 27377

Log:
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.


Modified:
   trunk/cfg-mplayer.h
   trunk/command.c
   trunk/configure
   trunk/input/input.c
   trunk/mplayer.c

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	(original)
+++ trunk/cfg-mplayer.h	Wed Jul 30 20:07:19 2008
@@ -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},

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	(original)
+++ trunk/command.c	Wed Jul 30 20:07:19 2008
@@ -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_cm
 				    "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

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Wed Jul 30 20:07:19 2008
@@ -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"

Modified: trunk/input/input.c
==============================================================================
--- trunk/input/input.c	(original)
+++ trunk/input/input.c	Wed Jul 30 20:07:19 2008
@@ -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}} } },

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Wed Jul 30 20:07:19 2008
@@ -335,7 +335,7 @@ char* current_module=NULL; // for debugg
 
 // ---
 
-#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);