Use type frontend_t* instead of void* in input plugin -> frontend function pointers

2 files changed, 9 insertions, 8 deletions

diff --git a/xine_frontend.c b/xine_frontend.c
index 41eecb08..b379b4f6 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.51 2008-03-13 23:32:16 phintuka Exp $
+ * $Id: xine_frontend.c,v 1.52 2008-03-31 20:36:03 phintuka Exp $
  *
  */
 
@@ -100,7 +100,7 @@ static int find_input(fe_t *this)
   return 1;
 }
 
-static void *fe_control(void *fe_handle, const char *cmd);
+static void *fe_control(frontend_t *fe_handle, const char *cmd);
 
 /*
  * xine callbacks
@@ -1068,7 +1068,7 @@ static int fe_xine_play(frontend_t *this_gen)
   input_vdr = (vdr_input_plugin_t *)this->input;
   input_vdr->f.xine_input_event = this->keypress;
   input_vdr->f.fe_control = fe_control;
-  input_vdr->f.fe_handle  = (void*)this;
+  input_vdr->f.fe_handle  = this_gen;
 
   if(this->playback_finished)
     LOGMSG("Error playing xvdr:// !");
@@ -1272,7 +1272,7 @@ static void process_xine_keypress(input_plugin_t *input,
 /*
  *  Control messages from input plugin
  */
-static void *fe_control(void *fe_handle, const char *cmd)
+static void *fe_control(frontend_t *fe_handle, const char *cmd)
 {
   fe_t *this = (fe_t*)fe_handle;
   post_plugins_t *posts;
diff --git a/xine_input_vdr.h b/xine_input_vdr.h
index e1ec89de..fa9c29fc 100644
--- a/xine_input_vdr.h
+++ b/xine_input_vdr.h
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_input_vdr.h,v 1.4 2008-02-27 00:30:43 phintuka Exp $
+ * $Id: xine_input_vdr.h,v 1.5 2008-03-31 20:36:03 phintuka Exp $
  *
  */
 
@@ -17,6 +17,7 @@ extern "C" {
 
 struct input_plugin_s;
 struct osd_command_s;
+struct frontend_s;
 
 typedef struct vdr_input_plugin_funcs_s {
   /* VDR --> input plugin (only local mode) */
@@ -26,10 +27,10 @@ typedef struct vdr_input_plugin_funcs_s {
   /* input plugin --> frontend (only local mode) */
   void (*xine_input_event)(const char *, const char *);
   /* input plugin --> frontend (remote mode) */
-  int  (*intercept_osd)(void *fe_handle, struct osd_command_s *);
+  int  (*intercept_osd)(struct frontend_s *, struct osd_command_s *);
   /* input plugin --> frontend */
-  void *(*fe_control)(void *fe_handle, const char *);
-  void *fe_handle;
+  void *(*fe_control)(struct frontend_s *, const char *);
+  struct frontend_s *fe_handle;
   /* frontend --> input plugin (remote mode) */
   int  (*input_control)(struct input_plugin_s *, const char *, const char *, int, int);
 } vdr_input_plugin_funcs_t;