From 9cef48bac77cbeefe7dade7cb38fb3a00a16733a Mon Sep 17 00:00:00 2001 From: siretart Date: Fri, 23 Apr 2010 10:22:44 +0000 Subject: rename 'struct keymap' -> 'struct mp_keymap' This avoids the compilation failure on kFreeBSD (at least amd64): In file included from libvo/vo_directfb2.c:44: libvo/video_out.h:267: error: redefinition of 'struct keymap' This is because libvo/vo_directfb2.c #includes sys/kd.h, which in turn includes sys/kbio.h, which defines another 'struct keymap'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31059 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/video_out.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libvo/video_out.h') diff --git a/libvo/video_out.h b/libvo/video_out.h index 1fce2c2877..4e8716f13e 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -269,11 +269,11 @@ extern char *monitor_hfreq_str; extern char *monitor_vfreq_str; extern char *monitor_dotclock_str; -struct keymap { +struct mp_keymap { int from; int to; }; -int lookup_keymap_table(const struct keymap *map, int key); +int lookup_keymap_table(const struct mp_keymap *map, int key); struct vo_rect { int left, right, top, bottom, width, height; }; -- cgit v1.2.3 From 3a34dbc927a4980606abb4331e7ba8ca6fc1a90d Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 25 Apr 2010 10:44:53 +0000 Subject: Add reinitialization support. Necessary for fullscreen on OSX. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31085 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/video_out.h | 1 + 1 file changed, 1 insertion(+) (limited to 'libvo/video_out.h') diff --git a/libvo/video_out.h b/libvo/video_out.h index 4e8716f13e..c1a5face11 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -33,6 +33,7 @@ #define VO_EVENT_EXPOSE 1 #define VO_EVENT_RESIZE 2 #define VO_EVENT_KEYPRESS 4 +#define VO_EVENT_REINIT 8 /* Obsolete: VOCTRL_QUERY_VAA 1 */ /* does the device support the required format */ -- cgit v1.2.3 From 2f629d79698d1c297e63b3013e002159d37e1ad3 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 25 Apr 2010 15:49:46 +0000 Subject: Deduplicate enable_mouse_movements declaration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31089 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/video_out.h | 1 + 1 file changed, 1 insertion(+) (limited to 'libvo/video_out.h') diff --git a/libvo/video_out.h b/libvo/video_out.h index c1a5face11..cdff7630a5 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -245,6 +245,7 @@ extern int vo_gamma_green_intensity; extern int vo_gamma_blue_intensity; extern int vo_nomouse_input; +extern int enable_mouse_movements; extern int vo_pts; extern float vo_fps; -- cgit v1.2.3 From 14c018a80f4908a6540e76e08047dcbf6d9dc059 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 25 Apr 2010 16:13:57 +0000 Subject: Avoid duplicating mouse-movement command-generation code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31091 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/video_out.h | 1 + 1 file changed, 1 insertion(+) (limited to 'libvo/video_out.h') diff --git a/libvo/video_out.h b/libvo/video_out.h index cdff7630a5..63f27ba0fb 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -281,6 +281,7 @@ struct vo_rect { }; void calc_src_dst_rects(int src_width, int src_height, struct vo_rect *src, struct vo_rect *dst, struct vo_rect *borders, const struct vo_rect *crop); +void vo_mouse_movement(int posx, int posy); static inline int aspect_scaling(void) { -- cgit v1.2.3