From 6fecce9466b8c6f0dfd3f8fcc38f7502852aec5c Mon Sep 17 00:00:00 2001
From: phintuka <phintuka>
Date: Fri, 14 Nov 2008 23:20:03 +0000
Subject: Renamed: toggle_fullscreen_state -> toggle_fullscreen_cb
 update_display_size     -> update_display_size_cb

---
 xine_fbfe_frontend.c     |  4 ++--
 xine_frontend.c          | 10 +++++-----
 xine_frontend_internal.h | 10 ++++++----
 xine_sxfe_frontend.c     |  4 ++--
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/xine_fbfe_frontend.c b/xine_fbfe_frontend.c
index 87c3dfae..65e03399 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.37 2008-11-14 23:03:02 phintuka Exp $
+ * $Id: xine_fbfe_frontend.c,v 1.38 2008-11-14 23:20:03 phintuka Exp $
  *
  */
 
@@ -286,7 +286,7 @@ static frontend_t *fbfe_get_frontend(void)
   this->fe.fe_run       = fbfe_run;
   this->fe.fe_interrupt = fbfe_interrupt;
 
-  this->x.update_display_size = fbfe_update_display_size;
+  this->x.update_display_size_cb = fbfe_update_display_size;
 
   /* override */
   this->fe_xine_init  = this->fe.xine_init;
diff --git a/xine_frontend.c b/xine_frontend.c
index 4cbc768d..df494d21 100644
--- a/xine_frontend.c
+++ b/xine_frontend.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_frontend.c,v 1.85 2008-11-14 00:49:48 phintuka Exp $
+ * $Id: xine_frontend.c,v 1.86 2008-11-14 23:20:03 phintuka Exp $
  *
  */
 
@@ -621,8 +621,8 @@ static int fe_xine_init(frontend_t *this_gen, const char *audio_driver,
   this->video_port_none = NULL;
   
   /* re-configure display size (DirectFB driver changes display mode in init) */
-  if(this->update_display_size)
-    this->update_display_size(this);
+  if(this->update_display_size_cb)
+    this->update_display_size_cb(this);
 
   /* create audio port */
 
@@ -1267,8 +1267,8 @@ static int fe_send_event(frontend_t *this_gen, const char *data)
     return FE_ERROR;
 
   if (!strcmp(data, "TOGGLE_FULLSCREEN")) {
-    if(this->toggle_fullscreen_state)
-      this->toggle_fullscreen_state(this);
+    if(this->toggle_fullscreen_cb)
+      this->toggle_fullscreen_cb(this);
 
   } else if (!strcmp(data, "QUIT")) {
     this->terminate_key_pressed = 1;
diff --git a/xine_frontend_internal.h b/xine_frontend_internal.h
index 3757bf1c..d774e54d 100644
--- a/xine_frontend_internal.h
+++ b/xine_frontend_internal.h
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_frontend_internal.h,v 1.3 2008-11-13 23:48:00 phintuka Exp $
+ * $Id: xine_frontend_internal.h,v 1.4 2008-11-14 23:20:03 phintuka Exp $
  *
  */
 
@@ -19,10 +19,12 @@
 #include "xine/post.h"
 
 typedef struct fe_s {
-  /* function pointers */
+  /* base class */
   frontend_t          fe;
-  void              (*update_display_size)    (struct fe_s *);
-  void              (*toggle_fullscreen_state)(struct fe_s *);
+
+  /* called from xine_frontend.c */
+  void   (*update_display_size_cb) (struct fe_s *);
+  void   (*toggle_fullscreen_cb)   (struct fe_s *);
 
   /* vdr callbacks */
   fe_keypress_f       keypress;
diff --git a/xine_sxfe_frontend.c b/xine_sxfe_frontend.c
index 55a85589..7565939e 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.98 2008-11-14 23:11:43 phintuka Exp $
+ * $Id: xine_sxfe_frontend.c,v 1.99 2008-11-14 23:20:03 phintuka Exp $
  *
  */
 
@@ -1735,7 +1735,7 @@ static frontend_t *sxfe_get_frontend(void)
   this->fe.fe_run       = sxfe_run;
   this->fe.fe_interrupt = sxfe_interrupt;
 
-  this->x.toggle_fullscreen_state = sxfe_toggle_fullscreen;
+  this->x.toggle_fullscreen_cb = sxfe_toggle_fullscreen;
 
   /* override */
 
-- 
cgit v1.2.3