summaryrefslogtreecommitdiffstats
path: root/libvo/x11_common.h
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2011-12-06 20:23:54 +0100
committerwm4 <wm4@mplayer2.org>2011-12-06 20:32:33 +0100
commitd4de92e80897abb64dc8ccecb7823cbe291bb52d (patch)
tree0686f943152165b2cab91a79287ea788083bc474 /libvo/x11_common.h
parent421c840b3c061de89b426244fe75237a73f765de (diff)
downloadmpv-d4de92e80897abb64dc8ccecb7823cbe291bb52d.tar.bz2
mpv-d4de92e80897abb64dc8ccecb7823cbe291bb52d.tar.xz
libvo: remove title argument from struct vo_driver.config
This affects only the "new" VO API. The config() title argument was barely used, and it's hardcoded to "MPlayer" in vf_vo.c. The X11 and the Cocoa GUI backends, which are the only ones properly supporting window titles, ignored this argument. Remove the title argument. Add the vo_get_window_title function. All GUI VOs are supposed to use it for the window title.
Diffstat (limited to 'libvo/x11_common.h')
-rw-r--r--libvo/x11_common.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/libvo/x11_common.h b/libvo/x11_common.h
index ab5188159c..a4e5c56a8e 100644
--- a/libvo/x11_common.h
+++ b/libvo/x11_common.h
@@ -135,7 +135,7 @@ uint32_t vo_x11_get_equalizer(const char *name, int *value);
void fstype_help(void);
void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis,
int x, int y, unsigned int width, unsigned int height, int flags,
- Colormap col_map, const char *classname, const char *title);
+ Colormap col_map, const char *classname);
void vo_x11_clearwindow_part(struct vo *vo, Window vo_window,
int img_width, int img_height);
void vo_x11_clearwindow(struct vo *vo, Window vo_window);
@@ -184,7 +184,8 @@ void xscreensaver_heartbeat(struct vo_x11_state *x11);
// Old VOs use incompatible function calls, translate them to new
// prototypes
#ifdef IS_OLD_VO
-#define vo_x11_create_vo_window(...) vo_x11_create_vo_window(global_vo, __VA_ARGS__)
+#define vo_x11_create_vo_window(vis, x, y, width, height, flags, col_map, classname, title) \
+ vo_x11_create_vo_window(global_vo, vis, x, y, width, height, flags, col_map, classname)
#define vo_x11_fullscreen() vo_x11_fullscreen(global_vo)
#define vo_x11_update_geometry() vo_x11_update_geometry(global_vo, 1)
#define vo_x11_ontop() vo_x11_ontop(global_vo)