Merge from 1.2 main.

1 files changed, 4 insertions, 22 deletions

diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c
index 069eb734a..946e963a3 100644
--- a/src/vdr/input_vdr.c
+++ b/src/vdr/input_vdr.c
@@ -2627,24 +2627,6 @@ static input_plugin_t *vdr_class_get_instance(input_class_t *cls_gen, xine_strea
 /*
  * vdr input plugin class stuff
  */
-
-static const char *vdr_class_get_description(input_class_t *this_gen)
-{
-  return _("VDR display device plugin");
-}
-
-static const char *vdr_class_get_identifier (input_class_t *this_gen)
-{
-  return "VDR";
-}
-
-static void vdr_class_dispose (input_class_t *this_gen)
-{
-  vdr_input_class_t *this = (vdr_input_class_t *)this_gen;
-
-  free(this);
-}
-
 static char **vdr_class_get_autoplay_list(input_class_t *this_gen,
                                           int *num_files)
 {
@@ -2668,11 +2650,11 @@ static void *init_class(xine_t *xine, void *data)
   this->mrls[ 1 ] = 0;
 
   this->input_class.get_instance      = vdr_class_get_instance;
-  this->input_class.get_identifier    = vdr_class_get_identifier;
-  this->input_class.get_description   = vdr_class_get_description;
+  this->input_class.identifier        = "VDR";
+  this->input_class.description       = N_("VDR display device plugin");
   this->input_class.get_dir           = NULL;
   this->input_class.get_autoplay_list = vdr_class_get_autoplay_list;
-  this->input_class.dispose           = vdr_class_dispose;
+  this->input_class.dispose           = default_input_class_dispose;
   this->input_class.eject_media       = NULL;
 
   return this;
@@ -2685,7 +2667,7 @@ static void *init_class(xine_t *xine, void *data)
 const plugin_info_t xine_plugin_info[] EXPORTED =
 {
   /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_INPUT, 17, "VDR", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_INPUT, 18, "VDR", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };