summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--frontend_local.c3
-rw-r--r--xine_fbfe_frontend.c4
-rw-r--r--xine_frontend.h5
-rw-r--r--xine_frontend_main.c6
-rw-r--r--xine_sxfe_frontend.c4
5 files changed, 12 insertions, 10 deletions
diff --git a/frontend_local.c b/frontend_local.c
index 62e57913..31256c0a 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.47 2010-03-13 12:11:51 phintuka Exp $
+ * $Id: frontend_local.c,v 1.48 2010-05-26 11:54:26 phintuka Exp $
*
*/
@@ -339,6 +339,7 @@ void cXinelibLocal::Action(void)
} else {
LOGDBG("cXinelibLocal::Action - fe created");
if(!curr_fe->fe_display_open(curr_fe, 0, 0, xc.width, xc.height, xc.fullscreen, xc.hud_osd,
+ xc.opengl_always, xc.opengl_hud,
xc.modeswitch, xc.modeline, xc.display_aspect,
keypress_handler, 0/*no_x_kbd*/, 0/*gui_hotkeys*/,
xc.video_port,
diff --git a/xine_fbfe_frontend.c b/xine_fbfe_frontend.c
index a8118297..719928cf 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.46 2010-01-04 08:00:50 phintuka Exp $
+ * $Id: xine_fbfe_frontend.c,v 1.47 2010-05-26 11:54:26 phintuka Exp $
*
*/
@@ -118,7 +118,7 @@ static void update_DFBARGS(const char *fb_dev)
*/
static int fbfe_display_open(frontend_t *this_gen,
int xpos, int ypos,
- int width, int height, int fullscreen, int hud,
+ int width, int height, int fullscreen, int hud, int opengl_always, int opengl_hud,
int modeswitch, const char *modeline, int aspect,
fe_keypress_f keyfunc, int no_x_kbd, int gui_hotkeys,
const char *video_port, int scale_video, int field_order,
diff --git a/xine_frontend.h b/xine_frontend.h
index 9f752bcd..6b051026 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.21 2010-02-14 12:53:06 phintuka Exp $
+ * $Id: xine_frontend.h,v 1.22 2010-05-26 11:54:26 phintuka Exp $
*
*/
@@ -64,7 +64,8 @@ struct frontend_s {
int (*fe_display_open)(frontend_t*,
int xpos, int ypos,
int winwidth, int winheight,
- int fullscreen, int hud, int modeswitch, const char *modeline,
+ int fullscreen, int hud, int opengl_always, int opengl_hud,
+ int modeswitch, const char *modeline,
int aspect, fe_keypress_f keypresshandler,
int no_x_kbd, int gui_hotkeys,
const char *video_port,
diff --git a/xine_frontend_main.c b/xine_frontend_main.c
index dd94493a..c8b4b48c 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.86 2010-05-21 12:53:55 phintuka Exp $
+ * $Id: xine_frontend_main.c,v 1.87 2010-05-26 11:54:26 phintuka Exp $
*
*/
@@ -471,7 +471,7 @@ static const struct option long_options[] = {
int main(int argc, char *argv[])
{
int ftcp = 0, fudp = 0, frtp = 0, reconnect = 0, firsttry = 1;
- int fullscreen = 0, hud = 0, xpos = 0, ypos = 0, width = 720, height = 576;
+ int fullscreen = 0, hud = 0, opengl_always = 0, opengl_hud = 0, xpos = 0, ypos = 0, width = 720, height = 576;
int pes_buffers = 250;
int scale_video = 1, aspect = 1;
int daemon_mode = 0, nokbd = 0, noxkbd = 0, slave_mode = 0;
@@ -754,7 +754,7 @@ int main(int argc, char *argv[])
}
/* Initialize display */
- if (!fe->fe_display_open(fe, xpos, ypos, width, height, fullscreen, hud, 0,
+ if (!fe->fe_display_open(fe, xpos, ypos, width, height, fullscreen, hud, opengl_always, opengl_hud, 0,
"", aspect, NULL, noxkbd, gui_hotkeys,
video_port, scale_video, 0,
aspect_controller, window_id)) {
diff --git a/xine_sxfe_frontend.c b/xine_sxfe_frontend.c
index b9db2a96..d8a7ae7b 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.121 2010-05-21 12:33:08 phintuka Exp $
+ * $Id: xine_sxfe_frontend.c,v 1.122 2010-05-26 11:54:26 phintuka Exp $
*
*/
@@ -1103,7 +1103,7 @@ static void create_windows(sxfe_t *this)
*/
static int sxfe_display_open(frontend_t *this_gen,
int xpos, int ypos,
- int width, int height, int fullscreen, int hud,
+ int width, int height, int fullscreen, int hud, int opengl_always, int opengl_hud,
int modeswitch, const char *modeline, int aspect,
fe_keypress_f keyfunc, int no_x_kbd, int gui_hotkeys,
const char *video_port, int scale_video, int field_order,