diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
| commit | 6cce822505c0a76ac520909a895021b8f5b7e5ab (patch) | |
| tree | f8ba954c698470208a243be3da216f7f54367f46 /command.c | |
| parent | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff) | |
| parent | ded7033671fb7d84fbdb67ace46c1fc8833631bc (diff) | |
| download | mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.bz2 mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.xz | |
Merge svn changes up to r27399
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
Diffstat (limited to 'command.c')
| -rw-r--r-- | command.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -51,11 +51,11 @@ #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 -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI #include "gui/interface.h" #endif @@ -977,7 +977,7 @@ static int mp_property_fullscreen(m_option_t *prop, int action, void *arg, return M_PROPERTY_OK; case M_PROPERTY_STEP_UP: case M_PROPERTY_STEP_DOWN: -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI if (use_gui) guiGetEvent(guiIEvent, (char *) MP_CMD_GUI_FULLSCREEN); else @@ -2492,7 +2492,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd) int n = cmd->args[0].v.i == 0 ? 1 : cmd->args[0].v.i; int force = cmd->args[1].v.i; -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI if (use_gui) { int i = 0; if (n > 0) @@ -3132,7 +3132,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 @@ -3168,7 +3168,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd) #endif default: -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI if ((use_gui) && (cmd->id > MP_CMD_GUI_EVENTS)) guiGetEvent(guiIEvent, (char *) cmd->id); else |