diff options
| -rw-r--r-- | frontend_local.c | 5 | ||||
| -rw-r--r-- | xine_fbfe_frontend.c | 9 | ||||
| -rw-r--r-- | xine_frontend.h | 5 | ||||
| -rw-r--r-- | xine_frontend_main.c | 11 | ||||
| -rw-r--r-- | xine_sxfe_frontend.c | 10 |
5 files changed, 24 insertions, 16 deletions
diff --git a/frontend_local.c b/frontend_local.c index 780520a4..15a7cf4e 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.31 2008-04-03 08:08:27 phintuka Exp $ + * $Id: frontend_local.c,v 1.32 2008-06-16 21:24:36 phintuka Exp $ * */ @@ -344,7 +344,8 @@ void cXinelibLocal::Action(void) xc.display_aspect, keypress_handler, xc.video_port, xc.scale_video, - xc.field_order)) { + xc.field_order, + NULL, -1)) { LOGMSG("cXinelibLocal: Error initializing display"); SetStopSignal(); } else { diff --git a/xine_fbfe_frontend.c b/xine_fbfe_frontend.c index e238ab11..2000128e 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.23 2008-06-16 11:36:49 phintuka Exp $ + * $Id: xine_fbfe_frontend.c,v 1.24 2008-06-16 21:24:36 phintuka Exp $ * */ @@ -178,7 +178,8 @@ 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, - int scale_video, int field_order) + int scale_video, int field_order, + const char *aspect_controller, int window_id) { fbfe_t *this = (fbfe_t*)this_gen; @@ -209,6 +210,7 @@ static int fbfe_display_open(frontend_t *this_gen, int width, int height, int fu this->overscan = 0; strn0cpy(this->modeline, modeline, sizeof(this->modeline)); this->display_ratio = 1.0; + this->aspect_controller = aspect_controller ? strdup(aspect_controller) : NULL; this->xine_visual_type = XINE_VISUAL_TYPE_FB; this->vis.frame_output_cb = fe_frame_output_cb; @@ -318,6 +320,9 @@ static void fbfe_display_close(frontend_t *this_gen) this->fd_tty = -1; } } + + free(this->aspect_controller); + this->aspect_controller = NULL; } static int fbfe_xine_init(frontend_t *this_gen, const char *audio_driver, diff --git a/xine_frontend.h b/xine_frontend.h index 09660b89..38205638 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 2008-03-28 22:17:17 phintuka Exp $ + * $Id: xine_frontend.h,v 1.8 2008-06-16 21:24:36 phintuka Exp $ * */ @@ -54,7 +54,8 @@ struct frontend_s { int fullscreen, int hud, int modeswitch, const char *modeline, int aspect, fe_keypress_f keypresshandler, const char *video_port, - int scale_video, int field_order); + int scale_video, int field_order, + const char *aspect_controller, int window_id); int (*fe_display_config)(frontend_t *, int width, int height, int fullscreen, int modeswitch, const char *modeline, 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; diff --git a/xine_sxfe_frontend.c b/xine_sxfe_frontend.c index ab0d4c5c..0dd5b876 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.60 2008-06-16 11:36:49 phintuka Exp $ + * $Id: xine_sxfe_frontend.c,v 1.61 2008-06-16 21:24:36 phintuka Exp $ * */ @@ -927,7 +927,8 @@ static int open_display(sxfe_t *this, const char *video_port) 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, - int scale_video, int field_order) + int scale_video, int field_order, + const char *aspect_controller, int window_id) { sxfe_t *this = (sxfe_t*)this_gen; double res_h, res_v, aspect_diff; @@ -980,6 +981,8 @@ static int sxfe_display_open(frontend_t *this_gen, int width, int height, int fu this->fullscreen_state_forced = 0; strn0cpy(this->modeline, modeline ? : "", sizeof(this->modeline)); this->xinerama_screen = -1; + this->aspect_controller = aspect_controller ? strdup(aspect_controller) : NULL; + this->window_id = window_id; /* * init x11 stuff @@ -1552,6 +1555,9 @@ static void sxfe_display_close(frontend_t *this_gen) XCloseDisplay (this->display); this->display = NULL; } + + free(this->aspect_controller); + this->aspect_controller = NULL; } /* |