diff options
| -rw-r--r-- | frontend_local.c | 4 | ||||
| -rw-r--r-- | xine_fbfe_frontend.c | 4 | ||||
| -rw-r--r-- | xine_frontend.h | 4 | ||||
| -rw-r--r-- | xine_frontend_main.c | 5 | ||||
| -rw-r--r-- | xine_sxfe_frontend.c | 9 |
5 files changed, 12 insertions, 14 deletions
diff --git a/frontend_local.c b/frontend_local.c index 15a7cf4e..f88a2baa 100644 --- a/frontend_local.c +++ b/frontend_local.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: frontend_local.c,v 1.32 2008-06-16 21:24:36 phintuka Exp $ + * $Id: frontend_local.c,v 1.33 2008-11-17 23:39:20 phintuka Exp $ * */ @@ -341,7 +341,7 @@ void cXinelibLocal::Action(void) LOGDBG("cXinelibLocal::Action - fe created"); if(!curr_fe->fe_display_open(curr_fe, xc.width, xc.height, xc.fullscreen, xc.hud_osd, xc.modeswitch, xc.modeline, - xc.display_aspect, keypress_handler, + xc.display_aspect, keypress_handler, 0, xc.video_port, xc.scale_video, xc.field_order, diff --git a/xine_fbfe_frontend.c b/xine_fbfe_frontend.c index 5fdf804c..9f954fb8 100644 --- a/xine_fbfe_frontend.c +++ b/xine_fbfe_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_fbfe_frontend.c,v 1.41 2008-11-16 15:27:54 rofafor Exp $ + * $Id: xine_fbfe_frontend.c,v 1.42 2008-11-17 23:39:20 phintuka Exp $ * */ @@ -117,7 +117,7 @@ static void update_DFBARGS(const char *fb_dev) */ static int fbfe_display_open(frontend_t *this_gen, int width, int height, int fullscreen, int hud, int modeswitch, const char *modeline, int aspect, - fe_keypress_f keyfunc, const char *video_port, + fe_keypress_f keyfunc, int gui_hotkeys, const char *video_port, int scale_video, int field_order, const char *aspect_controller, int window_id) { diff --git a/xine_frontend.h b/xine_frontend.h index 33b63812..c6412725 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.14 2008-11-13 22:46:23 phintuka Exp $ + * $Id: xine_frontend.h,v 1.15 2008-11-17 23:39:20 phintuka Exp $ * */ @@ -63,7 +63,7 @@ struct frontend_s { /* Display */ int (*fe_display_open)(frontend_t*, int winwidth, int winheight, int fullscreen, int hud, int modeswitch, const char *modeline, - int aspect, fe_keypress_f keypresshandler, + int aspect, fe_keypress_f keypresshandler, int gui_hotkeys, const char *video_port, int scale_video, int field_order, const char *aspect_controller, int window_id); diff --git a/xine_frontend_main.c b/xine_frontend_main.c index e45feed6..a8972343 100644 --- a/xine_frontend_main.c +++ b/xine_frontend_main.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend_main.c,v 1.68 2008-11-17 23:27:23 phintuka Exp $ + * $Id: xine_frontend_main.c,v 1.69 2008-11-17 23:39:20 phintuka Exp $ * */ @@ -691,7 +691,8 @@ int main(int argc, char *argv[]) /* Initialize display */ if (!fe->fe_display_open(fe, width, height, fullscreen, hud, 0, - "", aspect, NULL, video_port, scale_video, 0, + "", aspect, NULL, gui_hotkeys, + video_port, scale_video, 0, aspect_controller, window_id)) { fprintf(stderr, "Error opening display\n"); fe->fe_free(fe); diff --git a/xine_sxfe_frontend.c b/xine_sxfe_frontend.c index e83ed012..4ce216b0 100644 --- a/xine_sxfe_frontend.c +++ b/xine_sxfe_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_sxfe_frontend.c,v 1.102 2008-11-15 13:41:56 phintuka Exp $ + * $Id: xine_sxfe_frontend.c,v 1.103 2008-11-17 23:39:20 phintuka Exp $ * */ @@ -1084,7 +1084,7 @@ static void create_windows(sxfe_t *this) */ static int sxfe_display_open(frontend_t *this_gen, int width, int height, int fullscreen, int hud, int modeswitch, const char *modeline, int aspect, - fe_keypress_f keyfunc, const char *video_port, + fe_keypress_f keyfunc, int gui_hotkeys, const char *video_port, int scale_video, int field_order, const char *aspect_controller, int window_id) { @@ -1141,10 +1141,7 @@ static int sxfe_display_open(frontend_t *this_gen, int width, int height, int fu this->xinerama_screen = -1; -#if defined(XINELIBOUTPUT_FE_TOGGLE_FULLSCREEN) || defined(INTERPRET_LIRC_KEYS) - /* #warning TODO: make this command-line parameter */ - this->gui_hotkeys = 1; -#endif + this->gui_hotkeys = gui_hotkeys; /* * init x11 stuff |