summaryrefslogtreecommitdiff
path: root/xine_frontend.h
diff options
context:
space:
mode:
authorphintuka <phintuka>2009-06-08 11:35:46 +0000
committerphintuka <phintuka>2009-06-08 11:35:46 +0000
commitf7e0992232bfa1c9fa4c5d8b21f4eaa556b8c92f (patch)
tree1fcb8bca1d81bd4d91efcd7a5c807c351fd0d94a /xine_frontend.h
parent4eda6eabcd982e3fe9323ebe5775104d3217dba0 (diff)
downloadxineliboutput-unlabeled-1.7.2.tar.gz
xineliboutput-unlabeled-1.7.2.tar.bz2
Merged revision 1.18unlabeled-1.7.2
Added vdr-sxfe command-line option to disable X11 keyboard input
Diffstat (limited to 'xine_frontend.h')
-rw-r--r--xine_frontend.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/xine_frontend.h b/xine_frontend.h
index e2e15da4..bd4ed179 100644
--- a/xine_frontend.h
+++ b/xine_frontend.h
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xine_frontend.h,v 1.7.2.1 2009-06-08 09:09:55 phintuka Exp $
+ * $Id: xine_frontend.h,v 1.7.2.2 2009-06-08 11:35:46 phintuka Exp $
*
*/
@@ -53,8 +53,8 @@ struct frontend_s {
int (*fe_display_open)(frontend_t*,
int winwidth, int winheight,
int xpos, int ypos,
- int fullscreen, int hud, int modeswitch, const char *modeline,
- int aspect, fe_keypress_f keypresshandler,
+ int fullscreen, int hud, int modeswitch, const char *modeline,
+ int aspect, fe_keypress_f keypresshandler, int no_x_kbd,
const char *video_port,
int scale_video, int field_order);
int (*fe_display_config)(frontend_t *, int width, int height,