Merged 1.16 and 1.19

1 files changed, 6 insertions, 3 deletions

diff --git a/xine_frontend.h b/xine_frontend.h
index 09660b89..e2e15da4 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.7.2.1 2009-06-08 09:09:55 phintuka Exp $
  *
  */
 
@@ -50,7 +50,9 @@ struct frontend_config_s {
 
 struct frontend_s {
   /* Display */
-  int (*fe_display_open)(frontend_t*, int winwidth, int winheight, 
+  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, 
 			 const char *video_port,
@@ -67,7 +69,8 @@ struct frontend_s {
 		    const char *audio_port, 
 		    const char *video_driver, 
 		    int pes_buffers,
-		    const char *static_post);
+		    const char *static_post,
+                    const char *config_file);
   int  (*xine_open)(frontend_t*, const char *mrl);
   int  (*xine_play)(frontend_t*);
   int  (*xine_stop)(frontend_t*);