summaryrefslogtreecommitdiff
path: root/xine_frontend_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'xine_frontend_main.c')
-rw-r--r--xine_frontend_main.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/xine_frontend_main.c b/xine_frontend_main.c
index 17f4df9e..5a653b81 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.41 2008-05-19 06:54:58 phintuka Exp $
+ * $Id: xine_frontend_main.c,v 1.42 2008-06-16 21:24:36 phintuka Exp $
*
*/
@@ -388,9 +388,7 @@ int main(int argc, char *argv[])
int scale_video = 1, aspect = 1;
int daemon_mode = 0, nokbd = 0, slave_mode = 0;
char *video_port = NULL;
-#ifndef IS_FBFE
int window_id = -1;
-#endif
int xmajor, xminor, xsub;
int err, c;
frontend_t *fe = NULL;
@@ -613,14 +611,11 @@ int main(int argc, char *argv[])
fprintf(stderr, "Error initializing frontend\n");
return -3;
}
-#ifndef IS_FBFE
- ((fe_t*)fe)->window_id = window_id;
-#endif
- ((fe_t*)fe)->aspect_controller = aspect_controller;
/* Initialize display */
if(!fe->fe_display_open(fe, width, height, fullscreen, hud, 0,
- "", aspect, NULL, video_port, scale_video, 0)) {
+ "", aspect, NULL, video_port, scale_video, 0,
+ aspect_controller, window_id)) {
fprintf(stderr, "Error opening display\n");
fe->fe_free(fe);
return -4;