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 /libvo/vo_ggi.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 'libvo/vo_ggi.c')
-rw-r--r-- | libvo/vo_ggi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libvo/vo_ggi.c b/libvo/vo_ggi.c index b3f970ad8c..935e64ea95 100644 --- a/libvo/vo_ggi.c +++ b/libvo/vo_ggi.c @@ -29,7 +29,7 @@ #include <ggi/ggi.h> -#ifdef HAVE_GGIWMH +#ifdef CONFIG_GGIWMH #include <ggi/wmh.h> #endif @@ -72,7 +72,7 @@ static struct ggi_conf_s { } ggi_conf; -#ifdef HAVE_GGIWMH +#ifdef CONFIG_GGIWMH static void window_ontop(void) { mp_msg(MSGT_VO, MSGL_V, "[ggi] debug: window_ontop() called\n"); @@ -163,7 +163,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, #endif -#ifdef HAVE_GGIWMH +#ifdef CONFIG_GGIWMH ggiWmhSetTitle(ggi_conf.vis, title); if (vo_ontop) window_ontop(); #endif @@ -397,7 +397,7 @@ static int preinit(const char *arg) mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize GGI\n"); return -1; } -#ifdef HAVE_GGIWMH +#ifdef CONFIG_GGIWMH if (ggiWmhInit() < 0) { mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize libggiwmh\n"); return -1; @@ -426,7 +426,7 @@ static int preinit(const char *arg) ggi_conf.drawvis = ggi_conf.vis; -#ifdef HAVE_GGIWMH +#ifdef CONFIG_GGIWMH ggiWmhAttach(ggi_conf.vis); #endif @@ -442,7 +442,7 @@ static void uninit(void) if (ggi_conf.driver) free(ggi_conf.driver); -#ifdef HAVE_GGIWMH +#ifdef CONFIG_GGIWMH ggiWmhDetach(ggi_conf.vis); ggiWmhExit(); #endif @@ -461,7 +461,7 @@ static int control(uint32_t request, void *data) return query_format(*((uint32_t *) data)); case VOCTRL_GET_IMAGE: return get_image(data); -#ifdef HAVE_GGIWMH +#ifdef CONFIG_GGIWMH case VOCTRL_ONTOP: vo_ontop = (!(vo_ontop)); window_ontop(); |